summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-06-21 23:49:37 +0200
committerSergei Golubchik <serg@mariadb.org>2018-06-21 23:49:37 +0200
commitef64856b97be4d41b5a3581385057c67935bf77e (patch)
tree899a6bda88b9c270c580e1f32e8ed3be1f6fef63 /storage
parent082eec1418bc1af5477f8a7d19c48d3a3b4c4ad5 (diff)
downloadmariadb-git-ef64856b97be4d41b5a3581385057c67935bf77e.tar.gz
don't crash on innodb_undo_tablespaces=1
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/srv/srv0start.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
index 98dca77c61d..d59d260940e 100644
--- a/storage/innobase/srv/srv0start.cc
+++ b/storage/innobase/srv/srv0start.cc
@@ -840,6 +840,10 @@ srv_undo_tablespaces_init(bool create_new_db)
ut_a(srv_undo_tablespaces <= TRX_SYS_N_RSEGS);
ut_a(!create_new_db || srv_operation == SRV_OPERATION_NORMAL);
+ if (srv_undo_tablespaces == 1) { /* 1 is not allowed, make it 0 */
+ srv_undo_tablespaces = 0;
+ }
+
memset(undo_tablespace_ids, 0x0, sizeof(undo_tablespace_ids));
/* Create the undo spaces only if we are creating a new