[DRE-commits] [SCM] redmine.git branch, master-experimental, updated. debian/1.4.4+dfsg1-1-44-ga5600f5

[Ondřej Surý]

The following commit has been merged in the master-experimental branch:
commit 7f27f42400124c355c73ed9caf7fa750b77a1a88
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Dec 10 11:43:10 2012 +0100

    In ActiveRecord 3.2, MysqlAdapter extends AbstractMysqlAdapter, not AbstractAdapter (Courtesy of Adrian Wilkins)

diff --git a/debian/patches/2008_force_table_encoding_mysql.patch b/debian/patches/2008_force_table_encoding_mysql.patch
index b21dda7..0575d32 100644
--- a/debian/patches/2008_force_table_encoding_mysql.patch
+++ b/debian/patches/2008_force_table_encoding_mysql.patch
@@ -15,7 +15,7 @@ Last-Update: 2010-10-17
 +
 +module ActiveRecord
 +  module ConnectionAdapters
-+    class MysqlAdapter < AbstractAdapter
++    class MysqlAdapter < AbstractMysqlAdapter
 +      def create_table(table_name, options = {}) #:nodoc:
 +        encoding = @config[:encoding]
 +        if encoding

-- 
redmine.git