diff options
| author | unknown <konstantin@oak.local> | 2003-12-20 02:16:10 +0300 |
|---|---|---|
| committer | unknown <konstantin@oak.local> | 2003-12-20 02:16:10 +0300 |
| commit | 32c6b0d72a120dcafb1ae084bbc1c57c5fc5701f (patch) | |
| tree | c9441e15b696703bb24911352787db69a6784020 /sql/mysql_priv.h | |
| parent | 8d987f9e532689545becf521aa6a6aa6b23bf330 (diff) | |
| download | mariadb-git-32c6b0d72a120dcafb1ae084bbc1c57c5fc5701f.tar.gz | |
Prepared_statement deployed instead of PREP_STMT.
libmysqld/lib_sql.cc:
Prepared_statement now resides entirely in sql_prepare.cc
Embedded versions of setup_params_data moved to sql_prepare.cc
sql/mysql_priv.h:
removed declarations for non-existing functions
sql/slave.cc:
no thd->init_for_queries() any more
sql/sql_class.cc:
added Statement and Statement_map classes.
PREP_STMT replaced with Statement (Prepared_statement) and moved to
sql_prepare.cc
sql/sql_class.h:
added Statement and Statement_map classes.
PREP_STMT replaced with Statement (Prepared_statement) and moved to
sql_prepare.cc
sql/sql_parse.cc:
thd->init_for_queries() doesn't exist any more
comment moved to proper place
sql/sql_prepare.cc:
PREP_STMT replaced with Prepared_statement
minor code cleanups
tests/client_test.c:
Later in the test we rely on order of rows, which normally is not defined.
My patch changes the order.
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 863c1bdd419..ff50993ad50 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -612,8 +612,6 @@ int mysqld_show_column_types(THD *thd); int mysqld_help (THD *thd, const char *text); /* sql_prepare.cc */ -int compare_prep_stmt(void *not_used, PREP_STMT *stmt, ulong *key); -void free_prep_stmt(PREP_STMT *stmt, TREE_FREE mode, void *not_used); bool mysql_stmt_prepare(THD *thd, char *packet, uint packet_length); void mysql_stmt_execute(THD *thd, char *packet); void mysql_stmt_free(THD *thd, char *packet); @@ -855,7 +853,7 @@ extern I_List<THD> threads; extern I_List<NAMED_LIST> key_caches; extern MY_BITMAP temp_pool; extern String my_empty_string; -extern String my_null_string; +extern const String my_null_string; extern SHOW_VAR init_vars[],status_vars[], internal_vars[]; extern SHOW_COMP_OPTION have_isam; extern SHOW_COMP_OPTION have_innodb; |