MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:tomas Date:June 18 2007 4:00pm
Subject:bk commit into 5.1 tree (tomas:1.2549)
View as plain text  
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-06-18 18:00:04+02:00, tomas@stripped +5 -0
  Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
  into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco
  MERGE: 1.2506.1.24

  mysql-test/t/rpl_ndb_basic.test@stripped, 2007-06-18 18:00:00+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.8.1.3

  mysql-test/t/rpl_ndb_blob.test@stripped, 2007-06-18 18:00:00+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.4.1.1

  mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2007-06-18 18:00:00+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.11.1.1

  mysql-test/t/rpl_ndb_stm_innodb.test@stripped, 2007-06-18 18:00:00+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.1.1.1

  sql/ha_ndbcluster_binlog.cc@stripped, 2007-06-18 18:00:00+02:00, tomas@stripped +0 -0
    Auto merged
    MERGE: 1.104.3.15

# 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/RESYNC

--- 1.15/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-13 22:28:28 +02:00
+++ 1.16/mysql-test/t/rpl_ndb_dd_advance.test	2007-06-18 18:00:00 +02:00
@@ -11,7 +11,7 @@
 --source include/not_embedded.inc
 #--source include/big_test.inc
 #--source include/have_ndb_extra.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #### Test start cleanup section #####
 --disable_warnings

--- 1.5/mysql-test/t/rpl_ndb_blob.test	2007-04-23 15:50:42 +02:00
+++ 1.6/mysql-test/t/rpl_ndb_blob.test	2007-06-18 18:00:00 +02:00
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 #
 # basic test of blob replication for NDB

--- 1.12/mysql-test/t/rpl_ndb_basic.test	2007-04-11 08:02:31 +02:00
+++ 1.13/mysql-test/t/rpl_ndb_basic.test	2007-06-18 18:00:00 +02:00
@@ -1,6 +1,6 @@
 --source include/have_ndb.inc
 --source include/have_binlog_format_row.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 
 
 

--- 1.121/sql/ha_ndbcluster_binlog.cc	2007-06-18 07:37:30 +02:00
+++ 1.122/sql/ha_ndbcluster_binlog.cc	2007-06-18 18:00:00 +02:00
@@ -796,7 +796,7 @@
                    " end_pos BIGINT UNSIGNED NOT NULL, "
                    " PRIMARY KEY USING HASH (server_id) ) ENGINE=NDB");
 
-  const int no_print_error[2]= {701, 0}; // do not print error 701
+  const int no_print_error[3]= {701, 4009, 0}; // do not print error 701 etc
   run_query(thd, buf, end, no_print_error, TRUE);
 
   DBUG_RETURN(0);
@@ -853,7 +853,7 @@
                    " type INT UNSIGNED NOT NULL,"
                    " PRIMARY KEY USING HASH (db,name) ) ENGINE=NDB");
 
-  const int no_print_error[2]= {701, 0}; // do not print error 701
+  const int no_print_error[3]= {701, 4009, 0}; // do not print error 701 etc
   run_query(thd, buf, end, no_print_error, TRUE);
 
   DBUG_RETURN(0);

--- 1.10/mysql-test/t/rpl_ndb_stm_innodb.test	2007-04-25 20:41:43 +02:00
+++ 1.11/mysql-test/t/rpl_ndb_stm_innodb.test	2007-06-18 18:00:00 +02:00
@@ -28,7 +28,7 @@
 --source include/have_ndb.inc
 --source include/have_innodb.inc
 --source include/have_binlog_format_statement.inc
---source include/master-slave.inc
+--source include/ndb_master-slave.inc
 --enable_query_log
 let $off_set = 6;
 let $rpl_format = 'SBR';
Thread
bk commit into 5.1 tree (tomas:1.2549)tomas18 Jun