1 files changed, 6 insertions, 8 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
index de5232f960..5480204511 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -31,7 +31,7 @@ module ActiveRecord
           return false if blob_or_text_column? #mysql forbids defaults on blob and text columns
           super
         end
-        
+
         def blob_or_text_column?
           sql_type =~ /blob/i || type == :text
         end
@@ -140,7 +140,7 @@ module ActiveRecord
         @connection_options, @config = connection_options, config
         @quoted_column_names, @quoted_table_names = {}, {}
 
-        if config.fetch(:prepared_statements) { true }
+        if self.class.type_cast_config_to_boolean(config.fetch(:prepared_statements) { true })
           @visitor = Arel::Visitors::MySQL.new self
         else
           @visitor = BindSubstitution.new self
@@ -468,6 +468,7 @@ module ActiveRecord
       #   rename_table('octopuses', 'octopi')
       def rename_table(table_name, new_name)
         execute "RENAME TABLE #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
+        rename_table_indexes(table_name, new_name)
       end
 
       def add_column(table_name, column_name, type, options = {})
@@ -495,6 +496,7 @@ module ActiveRecord
 
       def rename_column(table_name, column_name, new_column_name) #:nodoc:
         execute("ALTER TABLE #{quote_table_name(table_name)} #{rename_column_sql(table_name, column_name, new_column_name)}")
+        rename_column_indexes(table_name, column_name, new_column_name)
       end
 
       # Maps logical Rails types to MySQL-specific data types.
@@ -579,7 +581,7 @@ module ActiveRecord
       end
 
       def strict_mode?
-        @config.fetch(:strict, true)
+        self.class.type_cast_config_to_boolean(@config.fetch(:strict, true))
       end
 
       protected
@@ -720,7 +722,7 @@ module ActiveRecord
         # Increase timeout so the server doesn't disconnect us.
         wait_timeout = @config[:wait_timeout]
         wait_timeout = 2147483 unless wait_timeout.is_a?(Fixnum)
-        variables[:wait_timeout] = wait_timeout
+        variables[:wait_timeout] = self.class.type_cast_config_to_integer(wait_timeout)
 
         # Make MySQL reject illegal values rather than truncating or blanking them, see
         # http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html#sqlmode_strict_all_tables
@@ -747,10 +749,6 @@ module ActiveRecord
         # ...and send them all in one query
         execute("SET #{encoding} #{variable_assignments}", :skip_logging)
       end
-
-      def valid_type?(type)
-        !native_database_types[type].nil?
-      end  
     end
   end
 end