diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-10-26 18:08:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 09:35:39 +0100 |
| commit | 17cf27f5b61aace463c3ae52df54c2363d2d4ca8 (patch) | |
| tree | 6d250b2e2af08abf5f70712da79c9fa9e75df807 | |
| parent | 4b854d47957173317294ed129690e11defdc8a8d (diff) | |
| download | mariadb-git-17cf27f5b61aace463c3ae52df54c2363d2d4ca8.tar.gz | |
remove non-working debug assert
and restore the test modified in the same commit
(the non-replication related deadlock will be reported separately)
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_slave_grp_exec.test | 3 | ||||
| -rw-r--r-- | mysys/my_error.c | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test index 84f4438dd76..e69c28500ae 100644 --- a/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test +++ b/mysql-test/suite/rpl/t/rpl_slave_grp_exec.test @@ -101,8 +101,7 @@ ALTER TABLE t1 ADD PRIMARY KEY (a); ALTER TABLE t2 ADD PRIMARY KEY (a); ALTER TABLE t3 ADD PRIMARY KEY (a); -#--sync_slave_with_master ---connection slave +--sync_slave_with_master RENAME TABLE t3 TO t3_bak; --connection master diff --git a/mysys/my_error.c b/mysys/my_error.c index 20836269939..2bb9305b2fb 100644 --- a/mysys/my_error.c +++ b/mysys/my_error.c @@ -112,9 +112,6 @@ void my_error(uint nr, myf MyFlags, ...) char ebuff[ERRMSGSIZE]; DBUG_ENTER("my_error"); 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))) (void) my_snprintf(ebuff, sizeof(ebuff), "Unknown error %d", nr); |