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_prepare.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_prepare.cc')
| -rw-r--r-- | sql/sql_prepare.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 3d85a46f3fd..fc8959c6493 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -592,11 +592,10 @@ static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables, JOIN *join= new JOIN(thd, fields, select_options, result); thd->used_tables= 0; // Updated by setup_fields - if (join->prepare(&select_lex->ref_pointer_array, tables, - wild_num, conds, og_num, order, group, having, proc, - select_lex, unit, 0, 0)) - DBUG_RETURN(1); - + if (join->prepare(&select_lex->ref_pointer_array, tables, + wild_num, conds, og_num, order, group, having, proc, + select_lex, unit, 0)) + DBUG_RETURN(1); if (send_prep_stmt(stmt, fields.elements) || thd->protocol_simple.send_fields(&fields, 0) || send_item_params(stmt)) |