database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-9979

Browse Source 
into  mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
jimw@mysql.com
2005-07-15 10:52:22 -07:00
parent b144b920a0 ec54dcb054
commit b4b874568b
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@@ -1940,7 +1940,8 @@ mysql_execute_command(THD *thd)
that is not a SHOW command or a select that only access local
variables, but for now this is probably good enough.
*/
if (tables || &lex->select_lex != lex->all_selects_list)
if (tables || &lex->select_lex != lex->all_selects_list ||
lex->time_zone_tables_used)
mysql_reset_errors(thd);
/*
@@ -5413,7 +5414,7 @@ int multi_update_precheck(THD *thd, TABLE_LIST *tables)
/*
Is there tables of subqueries?
*/
if (&lex->select_lex != lex->all_selects_list)
if (&lex->select_lex != lex->all_selects_list || lex->time_zone_tables_used)
{
DBUG_PRINT("info",("Checking sub query list"));
for (table= tables; table; table= table->next)