Skip to content

M
mariadb
Commit 2d1458ea authored by tomas@poseidon.ndb.mysql.com's avatar tomas@poseidon.ndb.mysql.com
Browse files
Options

mysqld.cc: 

  fixed erroneous previous push
parent 559f33b2
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
sql/mysqld.cc
View file @ 2d1458ea
...@@ -6106,8 +6106,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6106,8 +6106,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
else else
have_berkeley_db= SHOW_OPTION_DISABLED; have_berkeley_db= SHOW_OPTION_DISABLED;
#else #else
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (opt_bdb)
0,"this binary does not contain BDB storage engine"); push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
0,"this binary does not contain BDB storage engine");
#endif #endif
break; break;
case OPT_ISAM: case OPT_ISAM:
...@@ -6117,8 +6118,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6117,8 +6118,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
else else
have_isam= SHOW_OPTION_DISABLED; have_isam= SHOW_OPTION_DISABLED;
#else #else
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (opt_isam)
0,"this binary does not contain ISAM storage engine"); push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
0,"this binary does not contain ISAM storage engine");
#endif #endif
break; break;
case OPT_NDBCLUSTER: case OPT_NDBCLUSTER:
...@@ -6128,8 +6130,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6128,8 +6130,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
else else
have_ndbcluster= SHOW_OPTION_DISABLED; have_ndbcluster= SHOW_OPTION_DISABLED;
#else #else
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (opt_ndbcluster)
0,"this binary does not contain NDBCLUSTER storage engine"); push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
0,"this binary does not contain NDBCLUSTER storage engine");
#endif #endif
break; break;
case OPT_INNODB: case OPT_INNODB:
...@@ -6139,8 +6142,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6139,8 +6142,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
else else
have_innodb= SHOW_OPTION_DISABLED; have_innodb= SHOW_OPTION_DISABLED;
#else #else
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, if (opt_innodb)
0,"this binary does not contain INNODB storage engine"); push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,
0,"this binary does not contain INNODB storage engine");
#endif #endif
break; break;
case OPT_INNODB_DATA_FILE_PATH: case OPT_INNODB_DATA_FILE_PATH:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7