diff options
author | unknown <sergefp@mysql.com> | 2004-04-08 19:14:11 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2004-04-08 19:14:11 +0400 |
commit | 119beaf79cd1bd3e793589d02e8bae3133f0e5d5 (patch) | |
tree | d7c2614f7bc497deeefc539edde8de805976ca88 /sql/mysql_priv.h | |
parent | 10e15762b8e38ae09d89e6489de6f2fe68cfd85e (diff) | |
parent | 718d1f0aa7dd94f6bcadbb8418ad26db9b8f2c57 (diff) | |
download | mariadb-git-119beaf79cd1bd3e793589d02e8bae3133f0e5d5.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/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
-rw-r--r-- | sql/mysql_priv.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index bd9a94a969b..2d65e8395ea 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -613,8 +613,11 @@ 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); +class Prepared_statement; +Prepared_statement *mysql_stmt_prepare(THD *thd, char *packet, + uint packet_length, bool text_protocol=false); void mysql_stmt_execute(THD *thd, char *packet, uint packet_length); +void mysql_sql_stmt_execute(THD *thd, Prepared_statement *stmt); 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); |