diff options
| author | unknown <konstantin@oak.local> | 2003-12-01 17:46:07 +0300 |
|---|---|---|
| committer | unknown <konstantin@oak.local> | 2003-12-01 17:46:07 +0300 |
| commit | 6736de283919d00610b0766fdfd727fc3b254156 (patch) | |
| tree | f0caf1da4448acee3153afdddc74f62086e24b76 | |
| parent | 046b80bbeb074aeea3158c8108d93e6e6215d2e2 (diff) | |
| download | mariadb-git-6736de283919d00610b0766fdfd727fc3b254156.tar.gz | |
don't delete select_lex->having and select_lex->where as we delete
all items in free_prep_stmt(free_items);
indentation fix
| -rw-r--r-- | sql/sql_prepare.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index 9f7c0bc0b0c..790b80eb127 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -671,8 +671,6 @@ static bool mysql_test_select_fields(PREP_STMT *stmt, TABLE_LIST *tables, fix_tables_pointers(thd->lex.all_selects_list); if (!result && !(result= new select_send())) { - delete select_lex->having; - delete select_lex->where; send_error(thd, ER_OUT_OF_RESOURCES); DBUG_RETURN(1); } @@ -680,10 +678,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)) - DBUG_RETURN(1); + if (join->prepare(&select_lex->ref_pointer_array, tables, + wild_num, conds, og_num, order, group, having, proc, + select_lex, unit)) + DBUG_RETURN(1); if (send_prep_stmt(stmt, fields.elements) || thd->protocol_simple.send_fields(&fields, 0) || #ifndef EMBEDDED_LIBRARY |