database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

remove non-working debug assert

Browse Source 
and restore the test modified in the same commit
(the non-replication related deadlock will be reported separately)
This commit is contained in:
Sergei Golubchik
2020-10-26 18:08:58 +01:00
parent 4b854d4795
commit 17cf27f5b6
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/t/rpl_slave_grp_exec.test
View File

@@ -101,8 +101,7 @@ ALTER TABLE t1 ADD PRIMARY KEY (a);
ALTER TABLE t2 ADD PRIMARY KEY (a); ALTER TABLE t2 ADD PRIMARY KEY (a);
ALTER TABLE t3 ADD PRIMARY KEY (a); ALTER TABLE t3 ADD PRIMARY KEY (a);
#--sync_slave_with_master --sync_slave_with_master
--connection slave
RENAME TABLE t3 TO t3_bak; RENAME TABLE t3 TO t3_bak;
--connection master --connection master

3
mysys/my_error.c
View File

@@ -112,9 +112,6 @@ void my_error(uint nr, myf MyFlags, ...)
char ebuff[ERRMSGSIZE]; char ebuff[ERRMSGSIZE];
DBUG_ENTER("my_error"); DBUG_ENTER("my_error");
DBUG_PRINT("my", ("nr: %d MyFlags: %lu errno: %d", nr, MyFlags, errno)); DBUG_PRINT("my", ("nr: %d MyFlags: %lu errno: %d", nr, MyFlags, errno));
if (errno == 1213)
DBUG_ASSERT(0);
if (!(format = my_get_err_msg(nr))) if (!(format = my_get_err_msg(nr)))
(void) my_snprintf(ebuff, sizeof(ebuff), "Unknown error %d", nr); (void) my_snprintf(ebuff, sizeof(ebuff), "Unknown error %d", nr);