1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00

Fix spurious permissions problem when CONVERT_TZ() is used

in a multi-table update query. (Bug #9979)
This commit is contained in:
jimw@mysql.com
2005-06-17 08:56:04 -07:00
parent a3e72ec85a
commit ec54dcb054
3 changed files with 22 additions and 2 deletions

View File

@@ -1938,7 +1938,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);
#ifdef HAVE_REPLICATION
@@ -5354,7 +5355,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)