From 2d1458ea5bbb91595dd5284533566f7052445c9e Mon Sep 17 00:00:00 2001
From: "tomas@poseidon.ndb.mysql.com" <>
Date: Tue, 30 Nov 2004 14:52:05 +0000
Subject: [PATCH] mysqld.cc:   fixed erroneous previous push

---
 sql/mysqld.cc | 20 ++++++++++++--------
 1 file 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: