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 mysql.com:/home/ram/work/b29420/b29420.5.0

Browse Source 
into  mysql.com:/home/ram/work/b29420/b29420.5.1
This commit is contained in:
ramil/ram@ramil.myoffice.izhnet.ru
2007-07-07 12:04:11 +05:00
parent ba650762d1 483bd10de8
commit f38158f401
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/suite/rpl/r/rpl_rotate_logs.result
View File

@ -203,3 +203,11 @@ count(*)
100
unlock tables;
drop table if exists t1,t2,t3,t4;
End of 4.1 tests
show binlog events in 'non existing_binlog_file';
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
purge master logs before now();
show binlog events in '';
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
purge master logs before now();
End of 5.0 tests

14
mysql-test/suite/rpl/t/rpl_rotate_logs.test
View File

@ -166,4 +166,16 @@ connection master;
drop table if exists t1,t2,t3,t4;
sync_slave_with_master;
# End of 4.1 tests
--echo End of 4.1 tests
#
# Bug #29420: crash with show and purge binlogs
#
--error 1220
show binlog events in 'non existing_binlog_file';
purge master logs before now();
--error 1220
show binlog events in '';
purge master logs before now();
--echo End of 5.0 tests

6
sql/sql_repl.cc
View File

@ -1442,13 +1442,11 @@ err:
}
if (errmsg)
{
my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0),
"SHOW BINLOG EVENTS", errmsg);
DBUG_RETURN(TRUE);
}
else
send_eof(thd);
send_eof(thd);
pthread_mutex_lock(&LOCK_thread_count);
thd->current_linfo = 0;
pthread_mutex_unlock(&LOCK_thread_count);