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.1829 05/04/29 11:34:48 tomas@stripped +5 -0
removed binlog_index filter
test update
sql/mysqld.cc
1.456 05/04/29 11:34:43 tomas@stripped +2 -5
removed binlog_index filter
mysql-test/t/rpl_row_trans.test
1.4 05/04/29 11:34:43 tomas@stripped +2 -0
test update
mysql-test/t/rpl_row_basic_myisam.test
1.10 05/04/29 11:34:43 tomas@stripped +3 -1
test update
mysql-test/t/rpl_row_basic_innodb.test
1.4 05/04/29 11:34:43 tomas@stripped +6 -4
test update
mysql-test/r/rpl_ndb_idempotent.result
1.4 05/04/29 11:34:43 tomas@stripped +2 -2
removed binlog_index filter
# 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
--- 1.455/sql/mysqld.cc 2005-04-26 10:39:15 +02:00
+++ 1.456/sql/mysqld.cc 2005-04-29 11:34:43 +02:00
@@ -319,7 +319,7 @@
{ array_elements(binlog_format_names)-1,"",
binlog_format_names, NULL };
const char *opt_binlog_format= 0;
-enum Binlog_format { BF_NONE, BF_STMT, BF_ROW };
+enum Binlog_format { BF_NONE= 0, BF_STMT= 1, BF_ROW= 2 };
enum Binlog_format opt_binlog_format_id= BF_NONE;
unsigned long opt_binlog_rows_event_max_size = 1024;
@@ -6773,11 +6773,8 @@
{
if (opt_binlog_format_id == BF_NONE)
opt_binlog_format_id= BF_STMT;
- if (opt_ndbcluster)
- {
- rpl_filter->add_ignore_table("cluster_replication.binlog_index");
+ if (have_ndbcluster == SHOW_OPTION_YES)
opt_binlog_format_id= BF_ROW;
- }
if (opt_binlog_format_id == BF_ROW)
opt_binlog_row_level= TRUE;
}
--- 1.9/mysql-test/t/rpl_row_basic_myisam.test 2005-04-29 02:45:17 +02:00
+++ 1.10/mysql-test/t/rpl_row_basic_myisam.test 2005-04-29 11:34:43 +02:00
@@ -1,5 +1,7 @@
--source include/have_binlog_format_row.inc
-source include/master-slave.inc
+--source include/master-slave.inc
+
+let $VERSION=`select version()`;
#
# Basic tests of row-level logging
--- 1.3/mysql-test/t/rpl_row_basic_innodb.test 2005-04-29 02:45:17 +02:00
+++ 1.4/mysql-test/t/rpl_row_basic_innodb.test 2005-04-29 11:34:43 +02:00
@@ -1,5 +1,7 @@
--source include/have_binlog_format_row.inc
-source include/master-slave.inc
+--source include/master-slave.inc
+
+let $VERSION=`select version()`;
#
# Basic tests of row-level logging
@@ -19,7 +21,7 @@
INSERT INTO t1 VALUES ('A','C'), ('X', 'Z'), ('A', 'A');
--replace_result $VERSION VERSION
--replace_column 1 <binlog> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 232;
+SHOW BINLOG EVENTS;
SELECT * FROM t1;
sync_slave_with_master;
SELECT * FROM t1;
@@ -31,7 +33,7 @@
DELETE FROM t1 WHERE C1 = C2;
--replace_result $VERSION VERSION
--replace_column 1 <binlog> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 446;
+SHOW BINLOG EVENTS;
SELECT * FROM t1;
sync_slave_with_master;
SELECT * FROM t1;
@@ -45,7 +47,7 @@
UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
--replace_result $VERSION VERSION
--replace_column 1 <binlog> 2 <pos> 5 <end_log_pos>
-SHOW BINLOG EVENTS FROM 548;
+SHOW BINLOG EVENTS;
SELECT * FROM t1;
sync_slave_with_master;
SELECT * FROM t1;
--- 1.3/mysql-test/t/rpl_row_trans.test 2005-04-29 02:45:17 +02:00
+++ 1.4/mysql-test/t/rpl_row_trans.test 2005-04-29 11:34:43 +02:00
@@ -1,6 +1,8 @@
--source include/have_binlog_format_row.inc
source include/master-slave.inc
+let $VERSION=`select version()`;
+
#
# Testing mixed usage of storage engines
#
--- 1.3/mysql-test/r/rpl_ndb_idempotent.result 2005-04-27 16:57:25 +02:00
+++ 1.4/mysql-test/r/rpl_ndb_idempotent.result 2005-04-29 11:34:43 +02:00
@@ -34,14 +34,14 @@
row4 D 4
SHOW SLAVE STATUS;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1040 # # master-bin.000001 Yes Yes cluster_replication.binlog_index 0 0 1040 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 1040 # # master-bin.000001 Yes Yes 0 0 1040 # None 0 No #
STOP SLAVE;
CHANGE MASTER TO
master_log_file = 'master-bin.000001',
master_log_pos = 246 ;
SHOW SLAVE STATUS;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 246 # # master-bin.000001 No No cluster_replication.binlog_index 0 0 246 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000001 246 # # master-bin.000001 No No 0 0 246 # None 0 No #
START SLAVE;
SELECT * FROM t1 ORDER BY c3;
c1 c2 c3
| Thread |
|---|
| • bk commit into 5.1 tree (tomas:1.1829) | tomas | 29 Apr |
