summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2004-11-30 15:48:29 +0000
committerunknown <tomas@poseidon.ndb.mysql.com>2004-11-30 15:48:29 +0000
commitfc157af39d03b902b5dc8abda768c96e9df728d6 (patch)
treee72d7827e928a0155c70f446d599abc28656a6d7 /sql/mysqld.cc
parentea6614855fb2bc5a7e18e608524209d4546f0913 (diff)
downloadmariadb-git-fc157af39d03b902b5dc8abda768c96e9df728d6.tar.gz
use sql_print_warning instead of push_warning in mysqld.cc
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index f3c89b110af..57ca15e3b4c 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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: