At http://bazaar.launchpad.net/~maria-captains/maria/5.2/ ------------------------------------------------------------ revno: 2796 revision-id: sergii@pisem.net-20100521152540-aq4pxi2mwni01u2t parent: sergii@pisem.net-20100515124406-xnlef39r20mfskhn committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.2 timestamp: Fri 2010-05-21 17:25:40 +0200 message: mysql: don't crash when --show-warnings is enabled and the server suddenly goes away === modified file 'client/mysql.cc' --- a/client/mysql.cc 2010-04-08 13:02:49 +0000 +++ b/client/mysql.cc 2010-05-21 15:25:40 +0000 @@ -3588,7 +3588,7 @@ static void print_warnings() mysql_store_result_for_lazy(&result); /* Bail out when no warnings */ - if (!(num_rows= mysql_num_rows(result))) + if (!result || !(num_rows= mysql_num_rows(result))) goto end; cur= mysql_fetch_row(result);