summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <petr@mysql.com>2006-01-30 02:24:47 +0300
committerunknown <petr@mysql.com>2006-01-30 02:24:47 +0300
commit70471e6ae2ea44063876c9990c247b1ddfb08e6f (patch)
tree07ee094184e47fdb29a235417c9d7c119af51bb7 /sql/mysqld.cc
parentd4c61055ed8a7b25de19238edf64e0c3ee318128 (diff)
downloadmariadb-git-70471e6ae2ea44063876c9990c247b1ddfb08e6f.tar.gz
Do not create log table handler if run in bootstrap mode.
This patch also fixes annoying complains on the log tables absence, issued by the shell version of mysql-test-run. sql/log.h: check for the table log handler presence, as now it could be absent in some cases. Namely, during bootstrap. sql/mysqld.cc: do not create log table handler, if run in bootstrap mode.
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 54de70c1634..50617521e72 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3086,7 +3086,10 @@ static int init_server_components()
}
#ifdef WITH_CSV_STORAGE_ENGINE
- logger.init_log_tables();
+ if (opt_bootstrap)
+ opt_old_log_format= TRUE;
+ else
+ logger.init_log_tables();
if (opt_old_log_format || (have_csv_db != SHOW_OPTION_YES))
logger.set_handlers(LEGACY, opt_slow_log ? LEGACY:NONE,