diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-06 17:31:22 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-03-06 17:31:22 +0200 |
| commit | 36c2b9ca78db91d4e9781c33b2db754263fe76fa (patch) | |
| tree | 18109983a37bc675202712ae9785fd6040bfd418 /sql/sql_parse.cc | |
| parent | 840e853e000c8296815e0c7b2b8112f4e42ed973 (diff) | |
| parent | 236015ed7ac81e3a4525e04a7769cf503af38e14 (diff) | |
| download | mariadb-git-36c2b9ca78db91d4e9781c33b2db754263fe76fa.tar.gz | |
merge fixes
sql/item_subselect.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index b336f41aa7e..1e4b2d41275 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2431,7 +2431,7 @@ mysql_execute_command(THD *thd) (ORDER *)NULL, select_lex->options | thd->options | SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK, - result, unit, select_lex, 0, 0); + result, unit, select_lex, 0); if (thd->net.report_error) res= -1; delete result; |