diff options
author | unknown <hf@deer.(none)> | 2004-01-19 19:53:25 +0400 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2004-01-19 19:53:25 +0400 |
commit | c8eff1773e1a0896ccba36da559bb5db3b8197c8 (patch) | |
tree | 6442c2ebc134789f4bed8f0e909b2928c8f04321 /sql/sql_prepare.cc | |
parent | 0052fb4d357f650cc60ef7b9b67c6d79b70a976d (diff) | |
download | mariadb-git-c8eff1773e1a0896ccba36da559bb5db3b8197c8.tar.gz |
Code cleanup (working on PS & cleanup() code)
Item & changed with Item* in Item_xxx constructors
tables_list.first -> get_table_list()
sql/item.cc:
Item& -> Item*
sql/item.h:
Item& -> Item*
sql/item_cmpfunc.cc:
Item& -> Item*
sql/item_cmpfunc.h:
Item& -> Item*
sql/item_func.cc:
Item& -> Item*
sql/item_func.h:
Item& -> Item*
sql/item_sum.cc:
Item& -> Item*
sql/item_sum.h:
Item& -> Item*
sql/item_uniq.h:
Item& -> Item*
sql/sql_prepare.cc:
Code cleanup
sql/sql_select.cc:
Item& -> Item*
Diffstat (limited to 'sql/sql_prepare.cc')
-rw-r--r-- | sql/sql_prepare.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_prepare.cc b/sql/sql_prepare.cc index dd5825f27ac..52ad9b5e5fc 100644 --- a/sql/sql_prepare.cc +++ b/sql/sql_prepare.cc @@ -756,9 +756,8 @@ static bool mysql_test_select_fields(Prepared_statement *stmt, 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, if (join->prepare(&select_lex->ref_pointer_array, - (TABLE_LIST*)select_lex->table_list.first, + (TABLE_LIST*)select_lex->get_table_list(), wild_num, conds, og_num, order, group, having, proc, select_lex, unit)) DBUG_RETURN(1); @@ -1106,6 +1105,7 @@ void mysql_stmt_free(THD *thd, char *packet) if (!(stmt= find_prepared_statement(thd, stmt_id, "close"))) DBUG_VOID_RETURN; + free_items(stmt->free_list); /* Statement map deletes statement on erase */ thd->stmt_map.erase(stmt); DBUG_VOID_RETURN; |