mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1
into bisonxp.(none):/home/hf/work/mysql-4.1 BitKeeper/etc/logging_ok: auto-union libmysqld/lib_sql.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged
This commit is contained in:
@@ -825,8 +825,9 @@ err:
|
||||
}
|
||||
|
||||
|
||||
/* Execute one command from socket (query or simple command) */
|
||||
#ifndef EMBEDDED_LIBRARY
|
||||
|
||||
/* Execute one command from socket (query or simple command) */
|
||||
bool do_command(THD *thd)
|
||||
{
|
||||
char *packet;
|
||||
@@ -864,6 +865,7 @@ bool do_command(THD *thd)
|
||||
DBUG_RETURN(dispatch_command(command,thd, packet+1, (uint) packet_length));
|
||||
}
|
||||
|
||||
#endif /* EMBEDDED_LIBRARY */
|
||||
|
||||
bool dispatch_command(enum enum_server_command command, THD *thd,
|
||||
char* packet, uint packet_length)
|
||||
|
||||
Reference in New Issue
Block a user