Commit 86001f22 authored by unknown's avatar unknown

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
parent c2ff4fa0
...@@ -40,3 +40,4 @@ SELECT * FROM t2 ORDER BY a; ...@@ -40,3 +40,4 @@ SELECT * FROM t2 ORDER BY a;
a b a b
1 6 1 6
2 6 2 6
drop table t1,t2;
...@@ -31,3 +31,4 @@ sync_with_master; ...@@ -31,3 +31,4 @@ sync_with_master;
SELECT * FROM t1 ORDER BY a; SELECT * FROM t1 ORDER BY a;
SELECT * FROM t2 ORDER BY a; SELECT * FROM t2 ORDER BY a;
drop table t1,t2;
...@@ -1943,9 +1943,11 @@ mysql_execute_command(THD *thd) ...@@ -1943,9 +1943,11 @@ mysql_execute_command(THD *thd)
if (tables || &lex->select_lex != lex->all_selects_list) if (tables || &lex->select_lex != lex->all_selects_list)
mysql_reset_errors(thd); 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 When subselects or time_zone info is used in a query
* and set local variable 'tables' to point to this list. */ 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 || if ((&lex->select_lex != lex->all_selects_list ||
lex->time_zone_tables_used) && lex->time_zone_tables_used) &&
lex->unit.create_total_list(thd, lex, &tables)) lex->unit.create_total_list(thd, lex, &tables))
......
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