mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Merge mysql.com:/home/ram/work/b29420/b29420.5.0
into mysql.com:/home/ram/work/b29420/b29420.5.1 sql/sql_repl.cc: Auto merged mysql-test/suite/rpl/r/rpl_rotate_logs.result: Auto merged mysql-test/suite/rpl/t/rpl_rotate_logs.test: Auto merged
This commit is contained in:
commit
5c60418104
3 changed files with 23 additions and 5 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
||||
pthread_mutex_lock(&LOCK_thread_count);
|
||||
thd->current_linfo = 0;
|
||||
pthread_mutex_unlock(&LOCK_thread_count);
|
||||
|
|
Loading…
Reference in a new issue