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
1.1847 05/05/12 11:43:20 tomas@stripped +15 -0
+128 cols not supported yet for row-based repl
fix error in stopping ndb for some tests
added missing drop table
moved disbling to repective test for most of the row-based dependent tests
initialize active_mi to 0
sql/slave.cc
1.250 05/05/12 11:43:14 tomas@stripped +1 -1
initialize active_mi to 0
mysql-test/t/sp_trans.test
1.3 05/05/12 11:43:14 tomas@stripped +4 -0
missing drop table
mysql-test/t/sp.test
1.118 05/05/12 11:43:14 tomas@stripped +4 -0
diable for ndb
mysql-test/t/sp-threads.test
1.4 05/05/12 11:43:14 tomas@stripped +4 -0
diable for ndb
mysql-test/t/rpl_view.test
1.2 05/05/12 11:43:14 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/rpl_change_master.test
1.10 05/05/12 11:43:14 tomas@stripped +5 -0
+128 cols not supported yet for row-based repl
mysql-test/t/rpl000002.test
1.20 05/05/12 11:43:14 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/range.test
1.28 05/05/12 11:43:14 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/ps_1general.test
1.23 05/05/12 11:43:14 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/mysql_client_test.test
1.13 05/05/12 11:43:14 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/myisam.test
1.43 05/05/12 11:43:13 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/federated.test
1.9 05/05/12 11:43:13 tomas@stripped +3 -0
+128 cols not supported yet for row-based repl
mysql-test/t/disabled.def
1.15 05/05/12 11:43:13 tomas@stripped +4 -9
moved disbling to repective test for most of the row-based dependent tests
mysql-test/r/sp_trans.result
1.3 05/05/12 11:43:13 tomas@stripped +1 -0
added missing drop table
mysql-test/mysql-test-run.sh
1.271 05/05/12 11:43:13 tomas@stripped +4 -1
fix error in stopping ndb for some tests
# 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/wl2325-test
--- 1.270/mysql-test/mysql-test-run.sh 2005-05-09 23:17:22 +02:00
+++ 1.271/mysql-test/mysql-test-run.sh 2005-05-12 11:43:13 +02:00
@@ -1329,7 +1329,7 @@
if [ $slave_server_id -eq 2 ] ; then
savedir=`pwd`
cd $MYSQL_TEST_DIR
- ndb/ndbcluster $NDBCLUSTER_OPTS_SLAVE \
+ ./ndb/ndbcluster $NDBCLUSTER_OPTS_SLAVE \
--initial --small --diskless --ndbd-nodes=1 \
|| NDB_SLAVE_STATUS_OK=0
cd $savedir
@@ -1480,7 +1480,10 @@
fi
eval "SLAVE$1_RUNNING=0"
if [ -n "$USE_NDBCLUSTER_SLAVE" ] ; then
+ savedir=`pwd`
+ cd $MYSQL_TEST_DIR
./ndb/ndbcluster $NDBCLUSTER_OPTS_SLAVE --stop
+ cd $savedir
fi
fi
}
--- 1.249/sql/slave.cc 2005-05-09 23:17:24 +02:00
+++ 1.250/sql/slave.cc 2005-05-12 11:43:14 +02:00
@@ -37,7 +37,7 @@
volatile bool slave_sql_running = 0, slave_io_running = 0;
char* slave_load_tmpdir = 0;
-MASTER_INFO *active_mi;
+MASTER_INFO *active_mi= 0;
bool replicate_same_server_id;
ulonglong relay_log_space_limit = 0;
--- 1.1/mysql-test/t/rpl_view.test 2005-01-17 00:17:11 +01:00
+++ 1.2/mysql-test/t/rpl_view.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based cannot use CREATE ... SELECT
+--source include/have_binlog_format_statement.inc
+
source include/master-slave.inc;
--disable_warnings
drop table if exists t1,v1;
--- 1.22/mysql-test/t/ps_1general.test 2005-04-04 21:43:55 +02:00
+++ 1.23/mysql-test/t/ps_1general.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based currently allow max 128 cols
+--source include/have_binlog_format_statement.inc
+
###################### ps_general.test #######################
# #
# basic and miscellaneous tests for prepared statements #
--- 1.9/mysql-test/t/rpl_change_master.test 2005-03-02 17:52:26 +01:00
+++ 1.10/mysql-test/t/rpl_change_master.test 2005-05-12 11:43:14 +02:00
@@ -1,7 +1,12 @@
+# temporary disable test with ndb running until testcase is
+# made independent of ndb running or not, c.f. show processlist
+-- source include/not_ndb.inc
+
# Verify that after CHANGE MASTER, replication (I/O thread and SQL
# thread) restart from where SQL thread left, not from where
# I/O thread left (some old bug fixed in 4.0.17)
+--source include/have_binlog_format_statement.inc
source include/master-slave.inc;
connection master;
--- 1.12/mysql-test/t/mysql_client_test.test 2005-02-22 11:51:19 +01:00
+++ 1.13/mysql-test/t/mysql_client_test.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based currently allow max 128 cols
+--source include/have_binlog_format_statement.inc
+
# We run with different binaries for normal and --embedded-server
#
# If this test fails with "command "$MYSQL_CLIENT_TEST" failed",
--- 1.14/mysql-test/t/disabled.def 2005-05-10 17:48:55 +02:00
+++ 1.15/mysql-test/t/disabled.def 2005-05-12 11:43:13 +02:00
@@ -9,18 +9,13 @@
# Don't use any TAB characters for whitespace.
#
##############################################################################
-federated : row-based allow max 128 cols /Matz
ndb_autodiscover : replication conflict
ndb_autodiscover2 : replication conflict
ndb_cache : replication conflict
ndb_cache2 : replication conflict
ndb_cache_multi : replication conflict
ndb_cache_multi2 : replication conflict
-ndb_insert : Tomas fix sql REPLACE replication conflict
-ps_1general : row-based currently allow max 128 cols /Mats
-rpl000017 : Problem when (re)starting NDB /Matz
-rpl_change_master : result mismatch, Mats, Lars check
-rpl_deadlock : result mismatch, Mats, Lars check
-myisam : row-based currently allow max 128 cols /Mats
-mysql_client_test : row-based currently allow max 128 cols /Mats
-range : row-based currently allow max 128 cols /Mats
+ndb_insert : REPLACE replication conflict
+rpl_row_trans : NYI - non-transactional tables in transactions
+rpl_EE_error : error, hangs
+select : result mismatch
--- 1.27/mysql-test/t/range.test 2005-05-10 16:03:18 +02:00
+++ 1.28/mysql-test/t/range.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based currently allow max 128 cols
+--source include/have_binlog_format_statement.inc
+
-- source include/have_innodb.inc
#
--- 1.42/mysql-test/t/myisam.test 2005-04-16 17:58:09 +02:00
+++ 1.43/mysql-test/t/myisam.test 2005-05-12 11:43:13 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based currently allow max 128 cols
+--source include/have_binlog_format_statement.inc
+
#
# Test bugs in the MyISAM code
#
--- 1.8/mysql-test/t/federated.test 2005-03-21 08:10:02 +01:00
+++ 1.9/mysql-test/t/federated.test 2005-05-12 11:43:13 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based currently allow max 128 cols
+--source include/have_binlog_format_statement.inc
+
--source include/have_federated_db.inc
source include/master-slave.inc;
--- 1.3/mysql-test/t/sp-threads.test 2005-04-15 18:31:41 +02:00
+++ 1.4/mysql-test/t/sp-threads.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,7 @@
+# temporary disable for ndb until test is made independent on
+# rows in show processlist
+-- source include/not_ndb.inc
+
#
# Testing stored procedures with multiple connections,
# except security/privilege tests, they go to sp-security.test
--- 1.117/mysql-test/t/sp.test 2005-05-07 18:05:52 +02:00
+++ 1.118/mysql-test/t/sp.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,7 @@
+# temporary disable for ndb until test is made independent on
+# rows in show processlist
+-- source include/not_ndb.inc
+
#
# Basic stored PROCEDURE tests
#
--- 1.19/mysql-test/t/rpl000002.test 2004-02-17 00:35:14 +01:00
+++ 1.20/mysql-test/t/rpl000002.test 2005-05-12 11:43:14 +02:00
@@ -1,3 +1,6 @@
+# NYI - row-based currently allow max 128 cols
+--source include/have_binlog_format_statement.inc
+
source include/master-slave.inc;
# Test replication of auto_increment
--- 1.2/mysql-test/r/sp_trans.result 2005-03-18 14:33:41 +01:00
+++ 1.3/mysql-test/r/sp_trans.result 2005-05-12 11:43:13 +02:00
@@ -1,3 +1,4 @@
+drop table if exists t1;
drop procedure if exists bug8850|
create table t1 (a int) engine=innodb|
create procedure bug8850()
--- 1.2/mysql-test/t/sp_trans.test 2005-03-18 14:33:42 +01:00
+++ 1.3/mysql-test/t/sp_trans.test 2005-05-12 11:43:14 +02:00
@@ -3,6 +3,10 @@
#
-- source include/have_innodb.inc
+--disable_warnings
+drop table if exists t1;
+--enable_warnings
+
delimiter |;
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1847) | tomas | 12 May |
