mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Fixed BUG#8638: Test 'sp' fails: Stored Procedure often sends warning 1329
The warning sent is by itself ok, the problem was rather why it wasn't sent on some other platforms... The real problem was that a total_warn_count which was inconsistent with warn_list was sent back with send_eof() during SP execution, which in turn cause a protocol error in mysqltest.
This commit is contained in:
@ -359,7 +359,9 @@ send_eof(THD *thd, bool no_flush)
|
||||
if (thd->client_capabilities & CLIENT_PROTOCOL_41)
|
||||
{
|
||||
uchar buff[5];
|
||||
uint tmp= min(thd->total_warn_count, 65535);
|
||||
/* Don't send warn count during SP execution, as the warn_list
|
||||
is cleared between substatements, and mysqltest gets confused */
|
||||
uint tmp= (thd->spcont ? 0 : min(thd->total_warn_count, 65535));
|
||||
buff[0]=254;
|
||||
int2store(buff+1, tmp);
|
||||
/*
|
||||
|
Reference in New Issue
Block a user