database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Resolving of conflicts from pull

Browse Source
This commit is contained in:
hf@bison.(none)
2002-06-17 17:14:20 +05:00
parent 67c06bf63a 9ba0b3bc21
commit cc6407f1a5
17 changed files with 640 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_parse.cc
View File

@@ -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)