Commit fc157af3 authored by unknown's avatar unknown
Browse files

use sql_print_warning instead of push_warning in mysqld.cc

parent ea661485

sql/mysqld.cc

+4 −8
Original line number Diff line number Diff line
@@ -6107,8 +6107,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      have_berkeley_db= SHOW_OPTION_DISABLED;

#else

    if (opt_bdb)

      push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

		   0,"this binary does not contain BDB storage engine");

      sql_print_warning("this binary does not contain BDB storage engine");

#endif

    break;

  case OPT_ISAM:
@@ -6119,8 +6118,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      have_isam= SHOW_OPTION_DISABLED;

#else

    if (opt_isam)

      push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

		   0,"this binary does not contain ISAM storage engine");

      sql_print_warning("this binary does not contain ISAM storage engine");

#endif

    break;

  case OPT_NDBCLUSTER:
@@ -6131,8 +6129,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      have_ndbcluster= SHOW_OPTION_DISABLED;

#else

    if (opt_ndbcluster)

      push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

		   0,"this binary does not contain NDBCLUSTER storage engine");

      sql_print_warning("this binary does not contain NDBCLUSTER storage engine");

#endif

    break;

  case OPT_INNODB:
@@ -6143,8 +6140,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
      have_innodb= SHOW_OPTION_DISABLED;

#else

    if (opt_innodb)

      push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR,

		   0,"this binary does not contain INNODB storage engine");

      sql_print_warning("this binary does not contain INNODB storage engine");

#endif

    break;

  case OPT_INNODB_DATA_FILE_PATH: