Commit acb31ce6 authored by ingo@mysql.com's avatar ingo@mysql.com

Merge mysql.com:/home/mydev/mysql-5.1

into  mysql.com:/home/mydev/mysql-5.1-wl1563
parents 54c18272 4f792bbd
...@@ -1037,7 +1037,7 @@ drop table t1; ...@@ -1037,7 +1037,7 @@ drop table t1;
--error 1 --error 1
--exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1 --exec $MYSQL_TEST --record -x $MYSQL_TEST_DIR/var/tmp/bug11731.sql -R $MYSQL_TEST_DIR/var/tmp/bug11731.out 2>&1
# The .out file should be non existent # The .out file should be non existent
--exec test ! -e $MYSQL_TEST_DIR/var/tmp/bug11731.out --exec test ! -s $MYSQL_TEST_DIR/var/tmp/bug11731.out
drop table t1; drop table t1;
......
...@@ -136,7 +136,7 @@ public: ...@@ -136,7 +136,7 @@ public:
init_ends(THD *thd, Item *ends); init_ends(THD *thd, Item *ends);
void void
event_timed::init_body(THD *thd); init_body(THD *thd);
void void
init_comment(THD *thd, LEX_STRING *set_comment); init_comment(THD *thd, LEX_STRING *set_comment);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment