Commit c3755204 authored by unknown's avatar unknown

use sql_print_warning instead of push_warning in mysqld.cc

parent 4c3da7c1
...@@ -6107,8 +6107,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6107,8 +6107,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_berkeley_db= SHOW_OPTION_DISABLED; have_berkeley_db= SHOW_OPTION_DISABLED;
#else #else
if (opt_bdb) if (opt_bdb)
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_print_warning("this binary does not contain BDB storage engine");
0,"this binary does not contain BDB storage engine");
#endif #endif
break; break;
case OPT_ISAM: case OPT_ISAM:
...@@ -6119,8 +6118,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6119,8 +6118,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_isam= SHOW_OPTION_DISABLED; have_isam= SHOW_OPTION_DISABLED;
#else #else
if (opt_isam) if (opt_isam)
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_print_warning("this binary does not contain ISAM storage engine");
0,"this binary does not contain ISAM storage engine");
#endif #endif
break; break;
case OPT_NDBCLUSTER: case OPT_NDBCLUSTER:
...@@ -6131,8 +6129,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6131,8 +6129,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_ndbcluster= SHOW_OPTION_DISABLED; have_ndbcluster= SHOW_OPTION_DISABLED;
#else #else
if (opt_ndbcluster) if (opt_ndbcluster)
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_print_warning("this binary does not contain NDBCLUSTER storage engine");
0,"this binary does not contain NDBCLUSTER storage engine");
#endif #endif
break; break;
case OPT_INNODB: case OPT_INNODB:
...@@ -6143,8 +6140,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -6143,8 +6140,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
have_innodb= SHOW_OPTION_DISABLED; have_innodb= SHOW_OPTION_DISABLED;
#else #else
if (opt_innodb) if (opt_innodb)
push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_print_warning("this binary does not contain INNODB storage engine");
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