database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge

Browse Source 
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
This commit is contained in:
unknown
2003-02-04 03:27:47 +02:00
parent 55cb867968 5f64e3e843
commit adfe2c3ab4
10 changed files with 96 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_parse.cc
View File

@ -1069,7 +1069,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
case COM_CHANGE_USER:
{
thd->change_user();
clear_error_message(thd); // If errors from rollback
thd->clear_error(); // If errors from rollback
statistic_increment(com_other,&LOCK_status);
char *user= (char*) packet;
@ -1210,7 +1210,7 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
DBUG_PRINT("query",("%-.4096s",thd->query));
mysql_parse(thd,thd->query, thd->query_length);
while (!thd->is_fatal_error && thd->lex.found_colon)
while (!thd->killed && !thd->fatal_error && thd->lex.found_colon)
{
char *packet= thd->lex.found_colon;
/*
@ -1229,7 +1229,6 @@ bool dispatch_command(enum enum_server_command command, THD *thd,
}
thd->query_length= length;
thd->query= packet;
thd->net.last_error[0]= '\0';
VOID(pthread_mutex_lock(&LOCK_thread_count));
thd->query_id= query_id++;
VOID(pthread_mutex_unlock(&LOCK_thread_count));
@ -3263,8 +3262,7 @@ mysql_parse(THD *thd, char *inBuf, uint length)
DBUG_ENTER("mysql_parse");
mysql_init_query(thd);
thd->query_length = length;
thd->net.report_error= 0;
thd->clear_error();
if (query_cache_send_result_to_client(thd, inBuf, length) <= 0)
{