diff options
author | unknown <konstantin@oak.local> | 2004-03-02 22:39:50 +0300 |
---|---|---|
committer | unknown <konstantin@oak.local> | 2004-03-02 22:39:50 +0300 |
commit | 7b68eaafda1c553bc519e797d6c4dbf5847d3bbe (patch) | |
tree | d108cc6395d7ecb8169af4abe81b03df2d2fbea9 /sql/sql_lex.h | |
parent | 8286684e26d1639b56c942e0cce6c238a11f2a92 (diff) | |
download | mariadb-git-7b68eaafda1c553bc519e797d6c4dbf5847d3bbe.tar.gz |
Desperate attempt to push part of prepared statements cleanup which was
reviewed in Saint-Petersbourg (including post-review fixes).
include/my_sys.h:
Added clear_alloc_root (reset alloc root without freeing its memory)
sql/item.h:
- rename setup_param -> set_parap (function assigns parameter value to item)
sql/mysql_priv.h:
- all return values are void, because return value is never checked in
dispatch_command
- removed unused declaration of setup_param_functions
sql/protocol.h:
- unused declarations of setup_params_data* removed
sql/sql_class.cc:
Cleanup:
- bzero(mem_root) replaced with clear_alloc_root
- query_id and command members moved back to THD from Statement
Assignment of mem_root, free_list, query_id and command optimized
away from set_statement().
sql/sql_class.h:
- query_id and command moved back to THD from Statement
sql/sql_lex.h:
- better type for param_list
- param_count is the same thing as param_list.elements
sql/sql_parse.cc:
- comments for dispatch_command
sql/sql_prepare.cc:
Cleanup:
- added comments to many functions and removed trailing spaces in many
lines, some stale comments removed.
- it's faster to iterate using pointers, than classes
- Renames: error_in_prepare renamed to get_longdata_error (because it is set
when there is an error in mysql_send_longdata, rather than in
mysql_prepare), embedded versions of placeholder assignement functions
now have prefix emb_, setup_ functions renamed to set_, because they
perform assignment, not installation, setup_params_data now doesn't
call insert_params and was renamed to setup_set_param_functions,
- find_prepared_statement should not send error if called from no-reply
calls, like mysql_stmt_reset
- error reporting is checked up, to always report errors and not report
errors twice. send_prep_stmt can be done mostly in send_prepare_result,
rather than in test_* functions.
- now we don't need to reinit THD->mem_root/free_list in mysql_stmt_execute,
because it's not reset there.
tests/client_test.c:
- removed second call to test_subqueries
Diffstat (limited to 'sql/sql_lex.h')
-rw-r--r-- | sql/sql_lex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 17cccd75697..ba8fe0d8792 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -552,7 +552,7 @@ typedef struct st_lex List<Item> *insert_list,field_list,value_list; List<List_item> many_values; List<set_var_base> var_list; - List<Item> param_list; + List<Item_param> param_list; SQL_LIST proc_list, auxilliary_table_list, save_list; TYPELIB *interval; create_field *last_field; @@ -577,7 +577,6 @@ typedef struct st_lex uint uint_geom_type; uint grant, grant_tot_col, which_columns; uint fk_delete_opt, fk_update_opt, fk_match_option; - uint param_count; uint slave_thd_opt; uint8 describe; bool drop_if_exists, drop_temporary, local_file; |