diff options
| author | unknown <pem@mysql.com> | 2003-03-27 12:09:11 +0100 |
|---|---|---|
| committer | unknown <pem@mysql.com> | 2003-03-27 12:09:11 +0100 |
| commit | 8db55dcf86d87bece091520826f4142b96e9a283 (patch) | |
| tree | 3dbe93fb3b28f4aa6b8445c9b4aaa8c2ee776e02 /sql/mysql_priv.h | |
| parent | 34559e803839a8f34f63e6a992d7e93fcb040a1f (diff) | |
| parent | 2c9ef84cc35198c1ae888a335c2e228ecfb6b81d (diff) | |
| download | mariadb-git-8db55dcf86d87bece091520826f4142b96e9a283.tar.gz | |
Merged 4.1 into 5.0.
BitKeeper/etc/gone:
auto-union
BitKeeper/etc/logging_ok:
auto-union
client/mysql.cc:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/lex.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/share/polish/errmsg.txt:
Auto merged
sql/share/russian/errmsg.txt:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 678af8f881d..c4be04943c0 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -362,7 +362,7 @@ extern "C" pthread_handler_decl(handle_one_connection,arg); extern "C" pthread_handler_decl(handle_bootstrap,arg); void end_thread(THD *thd,bool put_in_cache); void flush_thread_cache(); -void mysql_execute_command(THD *thd); +int mysql_execute_command(THD *thd); bool do_command(THD *thd); bool dispatch_command(enum enum_server_command command, THD *thd, char* packet, uint packet_length); |