mysqld.cc:

  fixed erroneous previous push

sql/mysqld.cc

@@ -6106,6 +6106,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     else
       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");
 #endif
@@ -6117,6 +6118,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     else
       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");
 #endif
@@ -6128,6 +6130,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     else
       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");
 #endif
@@ -6139,6 +6142,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
     else
       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");
 #endif