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

Merge 5.1 main -> 5.1-rpl

Browse Source
This commit is contained in:
He Zhenxing
2008-09-06 08:51:17 +08:00
parent d0edf32230 d70d171cee
commit b17458dcc1
236 changed files with 143560 additions and 6402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@ -1583,6 +1583,12 @@ bool select_send::send_eof()
mysql_unlock_tables(thd, thd->lock);
thd->lock=0;
}
/*
Don't send EOF if we're in error condition (which implies we've already
sent or are sending an error)
*/
if (thd->is_error())
return TRUE;
::my_eof(thd);
is_result_set_started= 0;
return FALSE;