diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-09-24 10:24:55 +0300 |
| commit | 4e09f14b18ededb18aab527abe582fca34afe79c (patch) | |
| tree | 7a953ea10b82122bdf37cf7efc4cfd3fd9a20b17 /sql/mysql_priv.h | |
| parent | 48869febe61d1aef3e05af6bd17bab3e27b90f6d (diff) | |
| parent | 07001f78eca148d143ebf7fea66f4296a19a6d51 (diff) | |
| download | mariadb-git-4e09f14b18ededb18aab527abe582fca34afe79c.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into narttu.mysql.fi:/my/mysql-4.1
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index d4bacb57a38..1d7dd3aa5bb 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -577,6 +577,7 @@ void mysql_stmt_reset(THD *thd, char *packet); void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length); int check_insert_fields(THD *thd,TABLE *table,List<Item> &fields, List<Item> &values, ulong counter); +void setup_param_functions(Item_param *param, uchar param_type); /* sql_error.cc */ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, uint code, @@ -794,7 +795,7 @@ extern I_List<THD> threads; extern I_List<NAMED_LIST> key_caches; extern MY_BITMAP temp_pool; extern DATE_FORMAT dayord; -extern String empty_string; +extern String my_empty_string; extern SHOW_VAR init_vars[],status_vars[], internal_vars[]; extern struct show_table_type_st table_type_vars[]; extern SHOW_COMP_OPTION have_isam; @@ -803,6 +804,7 @@ extern SHOW_COMP_OPTION have_berkeley_db; extern struct system_variables global_system_variables; extern struct system_variables max_system_variables; extern struct rand_struct sql_rand; +extern String null_string; /* optional things, have_* variables */ |