bk commit into 5.1 tree (tomas:1.2588)

[tomas]

Below is the list of changes that have just been committed into a local
5.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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-23 09:33:24+02:00, tomas@stripped +4 -0
  Merge tulin@stripped:/home/bk/mysql-5.1-new-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-6.2
  MERGE: 1.2506.1.57

  mysql-test/t/disabled.def@stripped, 2007-07-23 09:33:19+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.243.1.14

  sql/ha_ndbcluster.h@stripped, 2007-07-23 09:33:19+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.170.3.10

  sql/set_var.cc@stripped, 2007-07-23 09:33:20+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.231.1.3

  storage/ndb/src/mgmsrv/ConfigInfo.cpp@stripped, 2007-07-23 09:33:20+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.94.1.18

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.2/RESYNC

--- 1.260/mysql-test/t/disabled.def	2007-07-03 18:31:45 +02:00
+++ 1.261/mysql-test/t/disabled.def	2007-07-23 09:33:19 +02:00
@@ -28,8 +28,8 @@
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD
 rpl_ndb_ddl              : BUG#18946 result file needs update + test needs to checked
 rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
-rpl_ndb_innodb2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement
-rpl_ndb_myisam2ndb       : Bug #19710  Cluster replication to partition table fails on DELETE FROM statement
+rpl_ndb_innodb2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
+rpl_ndb_myisam2ndb       : Bug#29549 rpl_ndb_myisam2ndb,rpl_ndb_innodb2ndb failed on Solaris for pack_length issue
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 synchronization          : Bug#24529  	Test 'synchronization' fails on Mac pushbuild; Also on Linux 64 bit.
 rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld default multibyte charset

--- 1.117/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-06-12 10:55:16 +02:00
+++ 1.118/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2007-07-23 09:33:20 +02:00
@@ -4004,16 +4004,16 @@
       }
     }
     if (db_host_count > 1 && node_group_warning.length() > 0)
-      ndbout_c("Cluster configuration warning:\n%s",node_group_warning.c_str());
+      ctx.reportWarning("Cluster configuration warning:\n%s",node_group_warning.c_str());
     if (!with_arbitration_rank) 
     {
-      ndbout_c("Cluster configuration warning:" 
+      ctx.reportWarning("Cluster configuration warning:" 
          "\n  Neither %s nor %s nodes are configured with arbitrator,"
          "\n  may cause complete cluster shutdown in case of host failure.", 
          MGM_TOKEN, API_TOKEN);
     }
     if (db_host_count > 1 && arbitration_warning.length() > 0)
-      ndbout_c("Cluster configuration warning:%s%s",arbitration_warning.c_str(),
+      ctx.reportWarning("Cluster configuration warning:%s%s",arbitration_warning.c_str(),
 	       "\n  Running arbitrator on the same host as a database node may"
 	       "\n  cause complete cluster shutdown in case of host failure.");
   }