mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge with 4.0.11
This commit is contained in:
@@ -2432,7 +2432,7 @@ mysql_execute_command(THD *thd)
|
||||
0, (ORDER *)NULL, (ORDER *)NULL, (Item *)NULL,
|
||||
(ORDER *)NULL,
|
||||
select_lex->options | thd->options |
|
||||
SELECT_NO_JOIN_CACHE,
|
||||
SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK,
|
||||
result, unit, select_lex, 0, 0);
|
||||
if (thd->net.report_error)
|
||||
res= -1;
|
||||
|
||||
Reference in New Issue
Block a user