database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

merge 5.5->5.3

Browse Source
This commit is contained in:
unknown
2014-05-07 09:28:12 +03:00
parent 554fd30ba3 285160dee2
commit 3f80740aa8
5 changed files with 115 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_select.cc
View File

@@ -646,7 +646,9 @@ JOIN::prepare(Item ***rref_pointer_array,
if (!(select_options & OPTION_SETUP_TABLES_DONE) &&
setup_tables_and_check_access(thd, &select_lex->context, join_list,
tables_list, select_lex->leaf_tables,
FALSE, SELECT_ACL, SELECT_ACL, FALSE))
FALSE, SELECT_ACL, SELECT_ACL,
(thd->lex->sql_command ==
SQLCOM_UPDATE_MULTI)))
DBUG_RETURN(-1);
/*