database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-30 11:22:14 +03:00
Code Activity

Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1

Browse Source 
into sanja.is.com.ua:/home/bell/mysql/work-crash-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown
2002-11-28 20:01:22 +02:00
parent 37a9917243 12b7086c5a
commit b9daa52c4b
35 changed files with 199 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_parse.cc
View File

@@ -1329,7 +1329,6 @@ mysql_execute_command(THD *thd)
*/
thd->old_total_warn_count= thd->total_warn_count;
thd->net.report_error= 0;
if (thd->slave_thread)
{
/*
@@ -2951,6 +2950,8 @@ mysql_parse(THD *thd, char *inBuf, uint length)
mysql_init_query(thd);
thd->query_length = length;
thd->net.report_error= 0;
if (query_cache_send_result_to_client(thd, inBuf, length) <= 0)
{
LEX *lex=lex_start(thd, (uchar*) inBuf, length);
@@ -2963,8 +2964,13 @@ mysql_parse(THD *thd, char *inBuf, uint length)
}
else
{
mysql_execute_command(thd);
query_cache_end_of_result(&thd->net);
if (thd->net.report_error)
send_error(thd, 0, NullS);
else
{
mysql_execute_command(thd);
query_cache_end_of_result(&thd->net);
}
}
}
else