From: Date: May 20 2008 11:50pm
Subject: bk commit into 5.0 tree (gshchepa:1.2632) BUG#36055
List-Archive: http://lists.mysql.com/commits/46899
X-Bug: 36055
Message-Id: <20080520215000.F35FC78BF3@devsrv-b.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of gshchepa.  When gshchepa does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-20 23:49:52+02:00, gshchepa@stripped +2 -0
  repair.result, sql_table.cc:
    Bug#36055: minor post-commit fix of typo in error message text.

  mysql-test/r/repair.result@stripped, 2008-05-20 23:49:24+02:00, gshchepa@stripped +1 -1
    Bug#36055: minor post-commit fix of typo in error message text.

  sql/sql_table.cc@stripped, 2008-05-20 23:49:20+02:00, gshchepa@stripped +1 -1
    Bug#36055: minor post-commit fix of typo in error message text.

diff -Nrup a/mysql-test/r/repair.result b/mysql-test/r/repair.result
--- a/mysql-test/r/repair.result	2008-05-12 17:59:09 +02:00
+++ b/mysql-test/r/repair.result	2008-05-20 23:49:24 +02:00
@@ -130,7 +130,7 @@ test.t1	check	error	Table upgrade requir
 # REPAIR old table USE_FRM should fail
 REPAIR TABLE t1 USE_FRM;
 Table	Op	Msg_type	Msg_text
-t1	repair	error	Failed reparing incompatible .FRM file
+t1	repair	error	Failed repairing incompatible .frm file
 # Run REPAIR TABLE to upgrade .frm file
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
diff -Nrup a/sql/sql_table.cc b/sql/sql_table.cc
--- a/sql/sql_table.cc	2008-05-12 17:59:16 +02:00
+++ b/sql/sql_table.cc	2008-05-20 23:49:20 +02:00
@@ -2121,7 +2121,7 @@ static int prepare_for_repair(THD* thd, 
   if (table->s->frm_version != FRM_VER_TRUE_VARCHAR)
   {
     error= send_check_errmsg(thd, table_list, "repair",
-                             "Failed reparing incompatible .FRM file");
+                             "Failed repairing incompatible .frm file");
     goto end;
   }