summaryrefslogtreecommitdiff
path: root/innobase
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2003-12-23 22:55:38 +0200
committerunknown <heikki@hundin.mysql.fi>2003-12-23 22:55:38 +0200
commit06f7d70ba6d457139cf0587f6dc90e874391cf92 (patch)
tree5ff0667ca00bf565d44c00331c8d08c255168db3 /innobase
parent8e139ddc336c75d155dd3e505d1ff7262822d7ac (diff)
downloadmariadb-git-06f7d70ba6d457139cf0587f6dc90e874391cf92.tar.gz
log0log.c:
Do not assert in log0log.c, line 856 if ib_logfiles are too small for innodb_thread_concurrency. Instead, print instructions how to adjust my.cnf and call exit(1). innobase/log/log0log.c: Do not assert in log0log.c, line 856 if ib_logfiles are too small for innodb_thread_concurrency. Instead, print instructions how to adjust my.cnf and call exit(1).
Diffstat (limited to 'innobase')
-rw-r--r--innobase/log/log0log.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/innobase/log/log0log.c b/innobase/log/log0log.c
index 1c7a79525e3..5df63e39296 100644
--- a/innobase/log/log0log.c
+++ b/innobase/log/log0log.c
@@ -661,7 +661,18 @@ failure:
if (!success) {
fprintf(stderr,
-"InnoDB: Error: log file group too small for innodb_thread_concurrency\n");
+"InnoDB: Error: ib_logfiles are too small for innodb_thread_concurrency %lu.\n"
+"InnoDB: The combined size of ib_logfiles should be bigger than\n"
+"InnoDB: 200 kB * innodb_thread_concurrency.\n"
+"InnoDB: To get mysqld to start up, set innodb_thread_concurrency in my.cnf\n"
+"InnoDB: to a lower value, for example, to 8. After an ERROR-FREE shutdown\n"
+"InnoDB: of mysqld you can adjust the size of ib_logfiles, as explained in\n"
+"InnoDB: section 5 of http://www.innodb.com/ibman.php",
+ (ulong)srv_thread_concurrency);
+ fprintf(stderr,
+"InnoDB: Cannot continue operation. Calling exit(1).\n");
+
+ exit(1);
}
return(success);