diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-30 17:00:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-01-31 10:23:20 +0200 |
| commit | 1293e5e59b6b412156ef8a78f762c0b099a10b50 (patch) | |
| tree | d6ae1f478874cd2dd1279d4116a840a38fad4b90 /storage/innobase/btr/btr0cur.cc | |
| parent | 9f918b9cf48989a9c1fedbd3fd8849d4d6892690 (diff) | |
| download | mariadb-git-1293e5e59b6b412156ef8a78f762c0b099a10b50.tar.gz | |
Rewrite the innodb.log_file_size test with DBUG_EXECUTE_IF.
Remove the debug parameter innodb_force_recovery_crash that was
introduced into MySQL 5.6 by me in WL#6494 which allowed InnoDB
to resize the redo log on startup.
Let innodb.log_file_size actually start up the server, but ensure
that the InnoDB storage engine refuses to start up in each of the
scenarios.
Diffstat (limited to 'storage/innobase/btr/btr0cur.cc')
| -rw-r--r-- | storage/innobase/btr/btr0cur.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/innobase/btr/btr0cur.cc b/storage/innobase/btr/btr0cur.cc index 8b139d58b96..9033c399ce2 100644 --- a/storage/innobase/btr/btr0cur.cc +++ b/storage/innobase/btr/btr0cur.cc @@ -3,7 +3,7 @@ Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2015, 2016, MariaDB Corporation. +Copyright (c) 2015, 2017, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -4208,7 +4208,6 @@ btr_cur_pessimistic_update( ut_ad(thr_get_trx(thr)->in_rollback); DBUG_EXECUTE_IF("ib_blob_update_rollback", DBUG_SUICIDE();); - RECOVERY_CRASH(99); btr_rec_free_updated_extern_fields( index, rec, page_zip, *offsets, update, true, mtr); |