diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2016-03-29 13:20:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-03-16 10:24:53 +0200 |
| commit | 7668a79a88a3103781ee23eace53ca3e9bbd6644 (patch) | |
| tree | 02fef5f3f33a36a0e056429c63c2e7632a9c4a3b /mysql-test/suite/innodb/t/innodb-32k-crash.test | |
| parent | 105f46ffb801bc1487c0383f73729fefa568f017 (diff) | |
| download | mariadb-git-7668a79a88a3103781ee23eace53ca3e9bbd6644.tar.gz | |
MDEV-12269 Port Bug#22996442 INNODB: MAKE UNIV_DEBUG DEPEND ON DBUG_OFF
This is a partial port of my patch in MySQL 8.0.
In MySQL 8.0, all InnoDB references to DBUG_OFF were replaced
with UNIV_DEBUG. We will not do that in MariaDB.
InnoDB used two independent compile-time flags that distinguish
debug and non-debug builds, which is confusing.
Also, make ut_ad() and alias of DBUG_ASSERT().
Diffstat (limited to 'mysql-test/suite/innodb/t/innodb-32k-crash.test')
| -rw-r--r-- | mysql-test/suite/innodb/t/innodb-32k-crash.test | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/mysql-test/suite/innodb/t/innodb-32k-crash.test b/mysql-test/suite/innodb/t/innodb-32k-crash.test index b9d96fd92c8..42d2b5adc9f 100644 --- a/mysql-test/suite/innodb/t/innodb-32k-crash.test +++ b/mysql-test/suite/innodb/t/innodb-32k-crash.test @@ -1,14 +1,7 @@ --source include/have_innodb.inc --source include/have_innodb_32k.inc ---source include/have_debug.inc -# Valgrind would complain about memory leaks when we crash on purpose. ---source include/not_valgrind.inc -# Embedded server does not support crashing +# Embedded server does not support restarting --source include/not_embedded.inc -# Avoid CrashReporter popup on Mac ---source include/not_crashrep.inc - -call mtr.add_suppression("InnoDB: Warning: innodb_page_size has been changed from default value *"); let $MYSQLD_DATADIR= `select @@datadir`; @@ -148,15 +141,9 @@ COMMIT; INSERT INTO t1 SELECT * from t2; -SET DEBUG_DBUG='+d,crash_commit_before'; ---exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect ---error 2013 +BEGIN; UPDATE t1 SET a=@e,b=@e,c=@e,d=@e,e=@e; - -# Write file to make mysql-test-run.pl restart the server ---enable_reconnect ---source include/wait_until_connected_again.inc ---disable_reconnect +--source include/kill_and_restart_mysqld.inc UPDATE t1 SET a=@f,b=@f,c=@f,d=@f,e=@f,f=@f,g=@f,h=@f,i=@f,j=@f, k=@f,l=@f,m=@f,n=@f,o=@f,p=@f,q=@f,r=@f,s=@f,t=@f,u=@f, |