database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge abotchkov@work.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.mysql.r18.ru:/home/hf/work/mysql-4.1.w1
This commit is contained in:
hf@deer.mysql.r18.ru
2003-01-21 09:46:07 +04:00
parent e757e47e7f fc94598773
commit 7d20900c6d
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
sql/sql_parse.cc
View File

@@ -1206,6 +1206,29 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
mysql_log.write(thd,command,"%s",thd->query);
DBUG_PRINT("query",("%-.4096s",thd->query));
mysql_parse(thd,thd->query, thd->query_length);
while (!thd->fatal_error && thd->lex.found_colon)
{
/*
Multiple queries exits, execute them individually
*/
if (thd->lock || thd->open_tables || thd->derived_tables)
close_thread_tables(thd);
uint length= thd->query_length-(uint)(thd->lex.found_colon-thd->query);
/* Remove garbage at start of query */
char *packet= thd->lex.found_colon;
while (my_isspace(system_charset_info,packet[0]) && length > 0)
{
packet++;
length--;
}
thd->query= packet;
thd->query_length= length;
mysql_parse(thd, packet, length);
}
if (!(specialflag & SPECIAL_NO_PRIOR))
my_pthread_setprio(pthread_self(),WAIT_PRIOR);
DBUG_PRINT("info",("query ready"));
@@ -1438,14 +1461,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
mysql_slow_log.write(thd, thd->query, thd->query_length, start_of_query);
}
}
if (command == COM_QUERY && thd->lex.found_colon)
{
/*
Multiple queries exits, execute them individually
*/
uint length= thd->query_length-(uint)(thd->lex.found_colon-thd->query)+1;
dispatch_command(command, thd, thd->lex.found_colon, length);
}
thd->proc_info="cleaning up";
VOID(pthread_mutex_lock(&LOCK_thread_count)); // For process list
thd->proc_info=0;
@@ -1476,7 +1491,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
bool alloc_query(THD *thd, char *packet, ulong packet_length)
{
packet_length--; // Remove end null
/* Remove garage at start and end of query */
/* Remove garbage at start and end of query */
while (my_isspace(system_charset_info,packet[0]) && packet_length > 0)
{
packet++;