summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/srv0srv.h
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2017-01-30 17:00:51 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2017-02-05 17:07:16 +0200
commitf1627045701b0dc0ff10ec09cca18dc5da351768 (patch)
tree6a3aba723cf060c17402dbfb434950d8f0dc6413 /storage/xtradb/include/srv0srv.h
parent20e8347447d55c06e426821de207091059ebd214 (diff)
downloadmariadb-git-f1627045701b0dc0ff10ec09cca18dc5da351768.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/xtradb/include/srv0srv.h')
-rw-r--r--storage/xtradb/include/srv0srv.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/storage/xtradb/include/srv0srv.h b/storage/xtradb/include/srv0srv.h
index 8f5ea21712c..9d4b6cd9557 100644
--- a/storage/xtradb/include/srv0srv.h
+++ b/storage/xtradb/include/srv0srv.h
@@ -419,9 +419,6 @@ extern double srv_adaptive_flushing_lwm;
extern ulong srv_flushing_avg_loops;
extern ulong srv_force_recovery;
-#ifndef DBUG_OFF
-extern ulong srv_force_recovery_crash;
-#endif /* !DBUG_OFF */
extern ulint srv_fast_shutdown; /*!< If this is 1, do not do a
purge and index buffer merge.