List:Commits« Previous MessageNext Message »
From:Kristofer Pettersson Date:July 28 2009 1:12pm
Subject:Re: bzr commit into mysql-5.1-bugteam branch
(kristofer.pettersson:2935) Bug#44521
View as plain text  
Davi Arnaut skrev:
>
> Test needs to be run under debug server only.
>
Fixed. Test moved to new file sp-debug.test

>> +--error 2013
>> +CALL p();
>> +--connection default
>> +--echo # Server should still be up and running on the default 
>> connection.
>> +DROP PROCEDURE p;
>> +--echo #
>
> disconnect con1 so that mysqltest resources associated with the 
> connection are freed.
>
Fixed.

>> +
>>   --echo # 
>> ------------------------------------------------------------------
>>   --echo # -- End of 5.1 tests
>>   --echo # 
>> ------------------------------------------------------------------
>>
>> === modified file 'sql/net_serv.cc'
>> --- a/sql/net_serv.cc    2009-02-13 16:41:47 +0000
>> +++ b/sql/net_serv.cc    2009-07-27 16:08:36 +0000
>> @@ -48,6 +48,7 @@
>>   #include<violite.h>
>>   #include<signal.h>
>>   #include<errno.h>
>> +#include<ctype.h>
ctype.h include removed as it was a remand from previous experimenation.

>>  
>>   /** Flush write_buffer if not empty. */
>>
>>   my_bool net_flush(NET *net)
>>   {
>>     my_bool error= 0;
>>     DBUG_ENTER("net_flush");
>> +
>>     if (net->buff != net->write_pos)
>>     {
Extra newline removed.
>>
>>   #if defined(MYSQL_SERVER)&&  defined(USE_QUERY_CACHE)
>>     query_cache_insert(net, (char*) packet, len);
>>   #endif
>> @@ -907,7 +912,6 @@ my_real_read(NET *net, size_t *complen)
>>               (int) net->buff[net->where_b + 3],
>>               (uint) (uchar) net->pkt_nr);
>>               fflush(stderr);
>> -            DBUG_ASSERT(0);
>
> No. I haven't seen a explanation for this.
>
The explaination is that in order to be able to execute the test case 
properly we need the error codes. The above segment is defined in  
EXTRA_DEBUG clause and will only cause the server to crash in debug mode 
for some ancient and unknown purpose of debugging. As we now have new 
needs to follow up on new issues, I find it reasonable to lift this 
restriction to be able to get the error code.

>>  
>> === modified file 'sql/sql_parse.cc'
>> --- a/sql/sql_parse.cc    2009-06-05 11:23:58 +0000
>> +++ b/sql/sql_parse.cc    2009-07-27 16:08:36 +0000
>> @@ -791,6 +791,7 @@ bool do_command(THD *thd)
>>     thd->clear_error();                // Clear error message
>>     thd->main_da.reset_diagnostics_area();
>>
>> +
>
> New line...
>
Fixed.



Thread
bzr commit into mysql-5.1-bugteam branch (kristofer.pettersson:2935)Bug#44521Kristofer Pettersson27 Jul
  • Re: bzr commit into mysql-5.1-bugteam branch(kristofer.pettersson:2935) Bug#44521Davi Arnaut27 Jul
    • Re: bzr commit into mysql-5.1-bugteam branch(kristofer.pettersson:2935) Bug#44521Kristofer Pettersson28 Jul