summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-04-16 17:36:47 +0200
committerSergei Golubchik <serg@mariadb.org>2016-04-19 11:27:00 +0200
commit3294cd11f852357b638cac74ba32578ffb456fc7 (patch)
tree19a504b5ab41567b6ebce3be8fbd1ad620f8e87c /sql/mysqld.cc
parent4f133fbf7951d0f48860cdefe79416f930615dab (diff)
downloadmariadb-git-3294cd11f852357b638cac74ba32578ffb456fc7.tar.gz
MDEV-9929 MariaDB segfaults on command "mysqld --version" with ignore-db-dir option on /etc/my.cnf
don't put command-line arguments into opt_ignore_db_dirs - it is supposed to contain a malloc()'ed accumulated list of all ignored dirs
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index fb52041fbc2..3450447ceb9 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -7800,6 +7800,7 @@ mysqld_get_one_option(int optid,
case OPT_IGNORE_DB_DIRECTORY:
+ opt_ignore_db_dirs= NULL; // will be set in ignore_db_dirs_process_additions
if (*argument == 0)
ignore_db_dirs_reset();
else