diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-30 14:52:05 +0000 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2004-11-30 14:52:05 +0000 |
| commit | cb6007ceb61a3733af011b1f0ff96e3951155f5b (patch) | |
| tree | e92d753598a154bc9e8571630ba2d184b057bc5e /sql/mysqld.cc | |
| parent | 16a130a2326e5f3986d0b6e54720b89e7a960ccd (diff) | |
| download | mariadb-git-cb6007ceb61a3733af011b1f0ff96e3951155f5b.tar.gz | |
mysqld.cc:
fixed erroneous previous push
sql/mysqld.cc:
fixed erroneous previous push
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bb1a6bc25ba..f3c89b110af 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -6106,8 +6106,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), else have_berkeley_db= SHOW_OPTION_DISABLED; #else - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, - 0,"this binary does not contain BDB storage engine"); + if (opt_bdb) + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, + 0,"this binary does not contain BDB storage engine"); #endif break; case OPT_ISAM: @@ -6117,8 +6118,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), else have_isam= SHOW_OPTION_DISABLED; #else - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, - 0,"this binary does not contain ISAM storage engine"); + if (opt_isam) + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, + 0,"this binary does not contain ISAM storage engine"); #endif break; case OPT_NDBCLUSTER: @@ -6128,8 +6130,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), else have_ndbcluster= SHOW_OPTION_DISABLED; #else - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, - 0,"this binary does not contain NDBCLUSTER storage engine"); + if (opt_ndbcluster) + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, + 0,"this binary does not contain NDBCLUSTER storage engine"); #endif break; case OPT_INNODB: @@ -6139,8 +6142,9 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), else have_innodb= SHOW_OPTION_DISABLED; #else - push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, - 0,"this binary does not contain INNODB storage engine"); + if (opt_innodb) + push_warning(current_thd, MYSQL_ERROR::WARN_LEVEL_ERROR, + 0,"this binary does not contain INNODB storage engine"); #endif break; case OPT_INNODB_DATA_FILE_PATH: |