[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mysql-internals
Subject:    bk commit into 4.1 tree (tomas:1.2174)
From:       tomas () mysql ! com
Date:       2004-11-30 13:53:18
Message-ID: 20041130145211.382F3814E2 () poseidon ! mysql ! com
[Download RAW message or body]

Below is the list of changes that have just been committed into a local
4.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2174 04/11/30 14:52:05 tomas@poseidon.ndb.mysql.com +1 -0
  mysqld.cc:
    fixed erroneous previous push

  sql/mysqld.cc
    1.528 04/11/30 14:51:12 tomas@poseidon.ndb.mysql.com +12 -8
    fixed erroneous previous push

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-4.1-clean

--- 1.527/sql/mysqld.cc	2004-11-30 10:22:35 +00:00
+++ 1.528/sql/mysqld.cc	2004-11-30 14:51:12 +00:00
@@ -6106,8 +6106,9 @@
     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 @@
     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 @@
     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 @@
     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:

-- 
MySQL Internals Mailing List
For list archives: http://lists.mysql.com/internals
To unsubscribe:    http://lists.mysql.com/internals?unsub=mysql-internals@progressive-comp.com

[prev in list] [next in list] [prev in thread] [next in thread]