3 files changed, 11 insertions, 4 deletions
diff --git a/activerecord/test/fixtures/db_definitions/mysql.sql b/activerecord/test/fixtures/db_definitions/mysql.sql
index 93b7fada3c..8a56ab2172 100755
--- a/activerecord/test/fixtures/db_definitions/mysql.sql
+++ b/activerecord/test/fixtures/db_definitions/mysql.sql
@@ -176,8 +176,8 @@ CREATE TABLE `authors` (
 
 CREATE TABLE `tasks` (
   `id` int(11) NOT NULL auto_increment,
-  `starting` datetime NOT NULL default '0000-00-00 00:00:00',
-  `ending` datetime NOT NULL default '0000-00-00 00:00:00',
+  `starting` datetime NOT NULL default '1000-01-01 00:00:00',
+  `ending` datetime NOT NULL default '1000-01-01 00:00:00',
   PRIMARY KEY  (`id`)
 ) TYPE=InnoDB;
 
diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb
index 825244d88e..0757c6a0c9 100644
--- a/activerecord/test/migration_test.rb
+++ b/activerecord/test/migration_test.rb
@@ -692,7 +692,7 @@ if ActiveRecord::Base.connection.supports_migrations?
 
         assert_nothing_raised {
           Person.connection.create_table :binary_testings do |t|
-            t.column "data", :binary, :default => "", :null => false
+            t.column "data", :binary, :null => false
           end
         }
 
@@ -702,7 +702,7 @@ if ActiveRecord::Base.connection.supports_migrations?
         if current_adapter?(:OracleAdapter)
           assert_equal "empty_blob()", data_column.default
         else
-          assert_equal "", data_column.default
+          assert_nil data_column.default
         end
 
         Person.connection.drop_table :binary_testings rescue nil
diff --git a/activerecord/test/schema_dumper_test.rb b/activerecord/test/schema_dumper_test.rb
index 8cbcbb39e5..576c2cebc3 100644
--- a/activerecord/test/schema_dumper_test.rb
+++ b/activerecord/test/schema_dumper_test.rb
@@ -89,6 +89,13 @@ if ActiveRecord::Base.connection.respond_to?(:tables)
       end
     end
 
+    if current_adapter?(:MysqlAdapter)
+      def test_schema_dump_should_not_add_default_value_for_mysql_text_field
+        output = standard_dump
+        assert_match %r{t.column "body",\s+:text,\s+:null => false$}, output
+      end
+    end
+
     def test_schema_dump_includes_decimal_options
       stream = StringIO.new      
       ActiveRecord::SchemaDumper.ignore_tables = [/^[^n]/]