2 files changed, 5 insertions, 2 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 98152853c2..db0ff749c1 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
@@ -769,6 +769,10 @@ module ActiveRecord
             options[:null] = column.null
           end
 
+          unless options.key?(:comment)
+            options[:comment] = column.comment
+          end
+
           td = create_table_definition(table_name)
           cd = td.new_column_definition(column.name, type, options)
           schema_creation.accept(ChangeColumnDefinition.new(cd, column.name))
diff --git a/activerecord/test/cases/comment_test.rb b/activerecord/test/cases/comment_test.rb
index 262ad319be..a625299e8d 100644
--- a/activerecord/test/cases/comment_test.rb
+++ b/activerecord/test/cases/comment_test.rb
@@ -2,7 +2,6 @@ require "cases/helper"
 require "support/schema_dumping_helper"
 
 if ActiveRecord::Base.connection.supports_comments?
-
   class CommentTest < ActiveRecord::TestCase
     include SchemaDumpingHelper
 
@@ -102,6 +101,7 @@ if ActiveRecord::Base.connection.supports_comments?
       # Do all the stuff from other tests
       @connection.add_column    :commenteds, :rating, :integer, comment: "I am running out of imagination"
       @connection.change_column :commenteds, :content, :string, comment: "Whoa, content describes itself!"
+      @connection.change_column :commenteds, :content, :string
       @connection.change_column :commenteds, :obvious, :string, comment: nil
       @connection.add_index     :commenteds, :obvious, name: "idx_obvious", comment: "We need to see obvious comments"
 
@@ -135,5 +135,4 @@ if ActiveRecord::Base.connection.supports_comments?
       assert_no_match %r[t\.string\s+"absent_comment", comment:\n], output
     end
   end
-
 end