diff options
| author | unknown <sergefp@mysql.com> | 2004-06-03 20:54:46 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-06-03 20:54:46 +0400 |
| commit | f0beff16f37c2adee70d8226190b4c529e8b14b1 (patch) | |
| tree | 544da240bba2e15bdf1323c90a3d28af7564155d /sql/mysql_priv.h | |
| parent | 0f7a9f61023d97b60286ed7b72f27a9fb343f083 (diff) | |
| parent | 1ed53ce4c62dafb47a5e3bc5bc0f2eab8aeabc38 (diff) | |
| download | mariadb-git-f0beff16f37c2adee70d8226190b4c529e8b14b1.tar.gz | |
Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/share/romanian/errmsg.txt:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 368774877d0..81dce036ccd 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -639,8 +639,10 @@ int mysqld_show_column_types(THD *thd); int mysqld_help (THD *thd, const char *text); /* sql_prepare.cc */ -void mysql_stmt_prepare(THD *thd, char *packet, uint packet_length); +int mysql_stmt_prepare(THD *thd, char *packet, uint packet_length, + LEX_STRING *name=NULL); void mysql_stmt_execute(THD *thd, char *packet, uint packet_length); +void mysql_sql_stmt_execute(THD *thd, LEX_STRING *stmt_name); void mysql_stmt_free(THD *thd, char *packet); void mysql_stmt_reset(THD *thd, char *packet); void mysql_stmt_get_longdata(THD *thd, char *pos, ulong packet_length); @@ -1068,6 +1070,9 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, LEX_STRING component); Item *get_system_var(THD *thd, enum_var_type var_type, const char *var_name, uint length, const char *item_name); +/* item_func.cc */ +int get_var_with_binlog(THD *thd, LEX_STRING &name, + user_var_entry **out_entry); /* log.cc */ bool flush_error_log(void); |