summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <elliot@mysql.com>2005-06-21 15:40:58 -0400
committerunknown <elliot@mysql.com>2005-06-21 15:40:58 -0400
commitd785fc60ab902842bf68bfb827120b8015700a98 (patch)
treea5ead01100ed2c4c53d5e215788ce8bf059e1389
parent5031e9adc81a10acc8902b0b8492a926a7fc3300 (diff)
downloadmariadb-git-d785fc60ab902842bf68bfb827120b8015700a98.tar.gz
BUG#10442 Minor changes from code review
mysql-test/r/rpl_multi_update3.result: Changes from code review mysql-test/t/rpl_multi_update3.test: Changes from code review sql/sql_parse.cc: Changes from code review
-rw-r--r--mysql-test/r/rpl_multi_update3.result1
-rw-r--r--mysql-test/t/rpl_multi_update3.test1
-rw-r--r--sql/sql_parse.cc8
3 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/r/rpl_multi_update3.result b/mysql-test/r/rpl_multi_update3.result
index 4126ef0b5cb..708b230b19f 100644
--- a/mysql-test/r/rpl_multi_update3.result
+++ b/mysql-test/r/rpl_multi_update3.result
@@ -40,3 +40,4 @@ SELECT * FROM t2 ORDER BY a;
a b
1 6
2 6
+drop table t1,t2;
diff --git a/mysql-test/t/rpl_multi_update3.test b/mysql-test/t/rpl_multi_update3.test
index ec6a0c09ae5..b8c8ed79532 100644
--- a/mysql-test/t/rpl_multi_update3.test
+++ b/mysql-test/t/rpl_multi_update3.test
@@ -31,3 +31,4 @@ sync_with_master;
SELECT * FROM t1 ORDER BY a;
SELECT * FROM t2 ORDER BY a;
+drop table t1,t2;
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 81fcc30dd08..4d339fc6a0e 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -1943,9 +1943,11 @@ mysql_execute_command(THD *thd)
if (tables || &lex->select_lex != lex->all_selects_list)
mysql_reset_errors(thd);
- /* When subselects or time_zone info is used in a query
- * we create a new TABLE_LIST containing all referenced tables
- * and set local variable 'tables' to point to this list. */
+ /*
+ When subselects or time_zone info is used in a query
+ we create a new TABLE_LIST containing all referenced tables
+ and set local variable 'tables' to point to this list.
+ */
if ((&lex->select_lex != lex->all_selects_list ||
lex->time_zone_tables_used) &&
lex->unit.create_total_list(thd, lex, &tables))