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

5.5.38 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2014-06-06 00:07:27 +02:00
parent 2a5905141a 6d75570e99
commit e27c338634
132 changed files with 2524 additions and 3328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_update.cc
View File

@ -1066,6 +1066,13 @@ bool mysql_prepare_update(THD *thd, TABLE_LIST *table_list,
thd->lex->allow_sum_func= 0;
/*
We do not call DT_MERGE_FOR_INSERT because it has no sense for simple
(not multi-) update
*/
if (mysql_handle_derived(thd->lex, DT_PREPARE))
DBUG_RETURN(TRUE);
if (setup_tables_and_check_access(thd, &select_lex->context,
&select_lex->top_join_list,
table_list,