bk commit into 5.0 tree (lars:1.1963)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.0 repository of lthalmann. When lthalmann 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.1963 05/09/12 01:12:41 lars@stripped +6 -0
  Enabling tests, more information in binary log

  mysql-test/r/rpl_row_basic_2myisam.result
    1.1 05/09/12 01:11:56 lars@stripped +329 -0
    Result file

  sql/log_event.h
    1.123 05/09/12 01:11:56 lars@stripped +4 -0
    More information in binary log

  sql/log_event.cc
    1.200 05/09/12 01:11:56 lars@stripped +14 -1
    More information in binary log

  mysql-test/t/rpl_replicate_do.test
    1.25 05/09/12 01:11:56 lars@stripped +1 -1
    Update of info

  mysql-test/t/rpl_multi_delete.test
    1.5 05/09/12 01:11:56 lars@stripped +0 -2
    Enabled test

  mysql-test/r/rpl_row_basic_2myisam.result
    1.0 05/09/12 01:11:56 lars@stripped +0 -0
    BitKeeper file
/users/lthalmann/bk/mysql-5.0-wl1012/mysql-test/r/rpl_row_basic_2myisam.result

  mysql-test/t/disabled.def
    1.9 05/09/12 01:11:55 lars@stripped +2 -3
    Enabling 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:	lars
# Host:	dl145j.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.0-wl1012

--- 1.199/sql/log_event.cc	2005-09-10 13:42:30 +02:00
+++ 1.200/sql/log_event.cc	2005-09-12 01:11:56 +02:00
@@ -5272,7 +5272,7 @@
   if (!short_form)
   {
     print_header(file);
-    fprintf(file, "\n# %s\n", get_type_str());
+    fprintf(file, "\n#%s\n", get_type_str());
   }
 }
 #endif
@@ -6060,5 +6060,18 @@
   DBUG_RETURN(error);
 }
 #endif /* !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION) */
+
+#ifdef MYSQL_CLIENT
+void Update_rows_log_event::print(FILE *file, bool short_form,
+				  LAST_EVENT_INFO* last_event_info)
+{
+  if (!short_form)
+  {
+    print_header(file);
+    // TODO: WL#2321
+    fprintf(file, "\tUpdate_rows: table id %lu\n", m_table_id);
+  }
+}
+#endif
 
 #endif /* defined(HAVE_ROW_BASED_REPLICATION) */

--- 1.122/sql/log_event.h	2005-09-10 13:42:30 +02:00
+++ 1.123/sql/log_event.h	2005-09-12 01:11:56 +02:00
@@ -1995,6 +1995,10 @@
 private:
   virtual Log_event_type get_type_code() { return (Log_event_type)TYPE_CODE; }
 
+#ifdef MYSQL_CLIENT
+  void print(FILE *file, bool short_form, LAST_EVENT_INFO *last_event_info);
+#endif
+
 #if !defined(MYSQL_CLIENT) && defined(HAVE_REPLICATION)
   gptr  m_memory;
   byte *m_key;

--- 1.4/mysql-test/t/rpl_multi_delete.test	2005-08-13 15:46:24 +02:00
+++ 1.5/mysql-test/t/rpl_multi_delete.test	2005-09-12 01:11:56 +02:00
@@ -1,5 +1,3 @@
-# 08/11/2005 Changed to stm based currently due to crash in rbr Bug#12536 [JBM]
---source include/have_binlog_format_statement.inc
 --source include/master-slave.inc
 create table t1 (a int);
 create table t2 (a int);

--- 1.8/mysql-test/t/disabled.def	2005-09-09 16:53:51 +02:00
+++ 1.9/mysql-test/t/disabled.def	2005-09-12 01:11:55 +02:00
@@ -15,9 +15,8 @@
 rpl_until       : Unstable test case, bug#12429
 rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712
-rpl_row_basic_2myisam:Causes core on slave Bug 12326
-rpl_row_replicate_do:Causes core on slave Bug 12421
-rpl_row_basic_3innodb:Causes core on slave Bug 12326
+rpl_row_replicate_do:Causes wrong result on slave Bug 12421
+rpl_row_basic_3innodb:Causes core on slave Bug 13090
 rpl_row_ddl:TRUNCATE TABLE is not being replicated Bug 12692
 rpl_row_mystery22:shows rbr slave issues Bug 12418
 rpl_row_relayrotate:Transaction Rollbacks not replicated Bug 12559
--- New file ---
+++ mysql-test/r/rpl_row_basic_2myisam.result	05/09/12 01:11:56
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
CREATE TABLE t1 (C1 CHAR(1), C2 CHAR(1), INDEX (C1)) ENGINE = 'MYISAM'  ;
SELECT * FROM t1;
C1	C2
SELECT * FROM t1;
C1	C2
INSERT INTO t1 VALUES ('A','B'), ('X','Y'), ('X','X');
INSERT INTO t1 VALUES ('A','C'), ('X','Z'), ('A','A');
SELECT * FROM t1 ORDER BY C1,C2;
C1	C2
A	A
A	B
A	C
X	X
X	Y
X	Z
SELECT * FROM t1 ORDER BY C1,C2;
C1	C2
A	A
A	B
A	C
X	X
X	Y
X	Z
DELETE FROM t1 WHERE C1 = C2;
SELECT * FROM t1 ORDER BY C1,C2;
C1	C2
A	B
A	C
X	Y
X	Z
SELECT * FROM t1 ORDER BY C1,C2;
C1	C2
A	B
A	C
X	Y
X	Z
UPDATE t1 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
SELECT * FROM t1 ORDER BY C1,C2;
C1	C2
A	B
A	I
X	Y
X	Z
SELECT * FROM t1 ORDER BY C1,C2;
C1	C2
A	B
A	I
X	Y
X	Z
CREATE TABLE t2 (c1 INT, c12 char(1), c2 INT, PRIMARY KEY (c1)) ENGINE = 'MYISAM'  ;
INSERT INTO t2 
VALUES (1,'A',2),  (2,'A',4),  (3,'A',9),  (4,'A',15), (5,'A',25), 
(6,'A',35), (7,'A',50), (8,'A',64), (9,'A',81);
SELECT * FROM t2 ORDER BY c1,c2;
c1	c12	c2
1	A	2
2	A	4
3	A	9
4	A	15
5	A	25
6	A	35
7	A	50
8	A	64
9	A	81
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
c1	c12	c2
2	A	4
3	A	9
5	A	25
8	A	64
9	A	81
SELECT * FROM t2 ORDER BY c1,c2;
c1	c12	c2
1	A	2
2	A	4
3	A	9
4	A	15
5	A	25
6	A	35
7	A	50
8	A	64
9	A	81
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
c1	c12	c2
2	A	4
3	A	9
5	A	25
8	A	64
9	A	81
UPDATE t2 SET c2 = c1*c1 WHERE c2 != c1*c1;
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
c1	c12	c2
1	A	1
2	A	4
3	A	9
4	A	16
5	A	25
6	A	36
7	A	49
8	A	64
9	A	81
SELECT * FROM t2 WHERE c2 = c1 * c1 ORDER BY c1,c2;
c1	c12	c2
1	A	1
2	A	4
3	A	9
4	A	16
5	A	25
6	A	36
7	A	49
8	A	64
9	A	81
DELETE FROM t2 WHERE c1 % 4 = 0;
SELECT * FROM t2 ORDER BY c1,c2;
c1	c12	c2
1	A	1
2	A	4
3	A	9
5	A	25
6	A	36
7	A	49
9	A	81
SELECT * FROM t2 ORDER BY c1,c2;
c1	c12	c2
1	A	1
2	A	4
3	A	9
5	A	25
6	A	36
7	A	49
9	A	81
UPDATE t2 SET c12='X';
CREATE TABLE t3 (C1 CHAR(1), C2 CHAR(1), pk1 INT, C3 CHAR(1), pk2 INT, PRIMARY KEY
(pk1,pk2)) ENGINE = 'MYISAM'  ;
INSERT INTO t3 VALUES ('A','B',1,'B',1), ('X','Y',2,'B',1), ('X','X',3,'B',1);
INSERT INTO t3 VALUES ('A','C',1,'B',2), ('X','Z',2,'B',2), ('A','A',3,'B',2);
SELECT * FROM t3 ORDER BY C1,C2;
C1	C2	pk1	C3	pk2
A	A	3	B	2
A	B	1	B	1
A	C	1	B	2
X	X	3	B	1
X	Y	2	B	1
X	Z	2	B	2
SELECT * FROM t3 ORDER BY C1,C2;
C1	C2	pk1	C3	pk2
A	A	3	B	2
A	B	1	B	1
A	C	1	B	2
X	X	3	B	1
X	Y	2	B	1
X	Z	2	B	2
DELETE FROM t3 WHERE C1 = C2;
SELECT * FROM t3 ORDER BY C1,C2;
C1	C2	pk1	C3	pk2
A	B	1	B	1
A	C	1	B	2
X	Y	2	B	1
X	Z	2	B	2
SELECT * FROM t3 ORDER BY C1,C2;
C1	C2	pk1	C3	pk2
A	B	1	B	1
A	C	1	B	2
X	Y	2	B	1
X	Z	2	B	2
UPDATE t3 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
SELECT * FROM t3 ORDER BY C1,C2;
C1	C2	pk1	C3	pk2
A	B	1	B	1
A	I	1	B	2
X	Y	2	B	1
X	Z	2	B	2
SELECT * FROM t3 ORDER BY C1,C2;
C1	C2	pk1	C3	pk2
A	B	1	B	1
A	I	1	B	2
X	Y	2	B	1
X	Z	2	B	2
CREATE TABLE t6 (C1 CHAR(1), C2 CHAR(1), C3 INT) ENGINE = 'MYISAM' ;
INSERT INTO t6 VALUES ('A','B',1), ('X','Y',2), ('X','X',3);
INSERT INTO t6 VALUES ('A','C',4), ('X','Z',5), ('A','A',6);
SELECT * FROM t6 ORDER BY C3;
C1	C2	C3
A	B	1
X	Y	2
X	X	3
A	C	4
X	Z	5
A	A	6
SELECT * FROM t6 ORDER BY C3;
C1	C2	C3
A	B	1
X	Y	2
X	X	3
A	C	4
X	Z	5
A	A	6
DELETE FROM t6 WHERE C1 = C2;
SELECT * FROM t6 ORDER BY C3;
C1	C2	C3
A	B	1
X	Y	2
A	C	4
X	Z	5
SELECT * FROM t6 ORDER BY C3;
C1	C2	C3
A	B	1
X	Y	2
A	C	4
X	Z	5
UPDATE t6 SET C2 = 'I' WHERE C1 = 'A' AND C2 = 'C';
SELECT * FROM t6 ORDER BY C3;
C1	C2	C3
A	B	1
X	Y	2
A	I	4
X	Z	5
SELECT * FROM t6 ORDER BY C3;
C1	C2	C3
A	B	1
X	Y	2
A	I	4
X	Z	5
CREATE TABLE t5 (C1 CHAR(1), C2 CHAR(1), C3 INT PRIMARY KEY) ENGINE = 'MYISAM'  ;
INSERT INTO t5 VALUES ('A','B',1), ('X','Y',2), ('X','X',3);
INSERT INTO t5 VALUES ('A','C',4), ('X','Z',5), ('A','A',6);
UPDATE t5,t2,t3 SET t5.C2='Q', t2.c12='R', t3.C3 ='S' WHERE t5.C1 = t2.c12 AND t5.C1 =
t3.C1;
SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY
t5.C3,t2.c1,t3.pk1,t3.pk2;
C1	C2	C3	c1	c12	c2	C1	C2	pk1	C3	pk2
X	Q	2	1	R	1	X	Y	2	S	1
X	Q	2	1	R	1	X	Z	2	S	2
X	Q	2	2	R	4	X	Y	2	S	1
X	Q	2	2	R	4	X	Z	2	S	2
X	Q	2	3	R	9	X	Y	2	S	1
X	Q	2	3	R	9	X	Z	2	S	2
X	Q	2	5	R	25	X	Y	2	S	1
X	Q	2	5	R	25	X	Z	2	S	2
X	Q	2	6	R	36	X	Y	2	S	1
X	Q	2	6	R	36	X	Z	2	S	2
X	Q	2	7	R	49	X	Y	2	S	1
X	Q	2	7	R	49	X	Z	2	S	2
X	Q	2	9	R	81	X	Y	2	S	1
X	Q	2	9	R	81	X	Z	2	S	2
X	Q	3	1	R	1	X	Y	2	S	1
X	Q	3	1	R	1	X	Z	2	S	2
X	Q	3	2	R	4	X	Y	2	S	1
X	Q	3	2	R	4	X	Z	2	S	2
X	Q	3	3	R	9	X	Y	2	S	1
X	Q	3	3	R	9	X	Z	2	S	2
X	Q	3	5	R	25	X	Y	2	S	1
X	Q	3	5	R	25	X	Z	2	S	2
X	Q	3	6	R	36	X	Y	2	S	1
X	Q	3	6	R	36	X	Z	2	S	2
X	Q	3	7	R	49	X	Y	2	S	1
X	Q	3	7	R	49	X	Z	2	S	2
X	Q	3	9	R	81	X	Y	2	S	1
X	Q	3	9	R	81	X	Z	2	S	2
X	Q	5	1	R	1	X	Y	2	S	1
X	Q	5	1	R	1	X	Z	2	S	2
X	Q	5	2	R	4	X	Y	2	S	1
X	Q	5	2	R	4	X	Z	2	S	2
X	Q	5	3	R	9	X	Y	2	S	1
X	Q	5	3	R	9	X	Z	2	S	2
X	Q	5	5	R	25	X	Y	2	S	1
X	Q	5	5	R	25	X	Z	2	S	2
X	Q	5	6	R	36	X	Y	2	S	1
X	Q	5	6	R	36	X	Z	2	S	2
X	Q	5	7	R	49	X	Y	2	S	1
X	Q	5	7	R	49	X	Z	2	S	2
X	Q	5	9	R	81	X	Y	2	S	1
X	Q	5	9	R	81	X	Z	2	S	2
SELECT * FROM t5,t2,t3 WHERE t5.C2='Q' AND t2.c12='R' AND t3.C3 ='S' ORDER BY
t5.C3,t2.c1,t3.pk1,t3.pk2;
C1	C2	C3	c1	c12	c2	C1	C2	pk1	C3	pk2
X	Q	2	1	R	1	X	Y	2	S	1
X	Q	2	1	R	1	X	Z	2	S	2
X	Q	2	2	R	4	X	Y	2	S	1
X	Q	2	2	R	4	X	Z	2	S	2
X	Q	2	3	R	9	X	Y	2	S	1
X	Q	2	3	R	9	X	Z	2	S	2
X	Q	2	5	R	25	X	Y	2	S	1
X	Q	2	5	R	25	X	Z	2	S	2
X	Q	2	6	R	36	X	Y	2	S	1
X	Q	2	6	R	36	X	Z	2	S	2
X	Q	2	7	R	49	X	Y	2	S	1
X	Q	2	7	R	49	X	Z	2	S	2
X	Q	2	9	R	81	X	Y	2	S	1
X	Q	2	9	R	81	X	Z	2	S	2
X	Q	3	1	R	1	X	Y	2	S	1
X	Q	3	1	R	1	X	Z	2	S	2
X	Q	3	2	R	4	X	Y	2	S	1
X	Q	3	2	R	4	X	Z	2	S	2
X	Q	3	3	R	9	X	Y	2	S	1
X	Q	3	3	R	9	X	Z	2	S	2
X	Q	3	5	R	25	X	Y	2	S	1
X	Q	3	5	R	25	X	Z	2	S	2
X	Q	3	6	R	36	X	Y	2	S	1
X	Q	3	6	R	36	X	Z	2	S	2
X	Q	3	7	R	49	X	Y	2	S	1
X	Q	3	7	R	49	X	Z	2	S	2
X	Q	3	9	R	81	X	Y	2	S	1
X	Q	3	9	R	81	X	Z	2	S	2
X	Q	5	1	R	1	X	Y	2	S	1
X	Q	5	1	R	1	X	Z	2	S	2
X	Q	5	2	R	4	X	Y	2	S	1
X	Q	5	2	R	4	X	Z	2	S	2
X	Q	5	3	R	9	X	Y	2	S	1
X	Q	5	3	R	9	X	Z	2	S	2
X	Q	5	5	R	25	X	Y	2	S	1
X	Q	5	5	R	25	X	Z	2	S	2
X	Q	5	6	R	36	X	Y	2	S	1
X	Q	5	6	R	36	X	Z	2	S	2
X	Q	5	7	R	49	X	Y	2	S	1
X	Q	5	7	R	49	X	Z	2	S	2
X	Q	5	9	R	81	X	Y	2	S	1
X	Q	5	9	R	81	X	Z	2	S	2
CREATE TABLE t4 (C1 CHAR(1) PRIMARY KEY, B1 BIT(1), B2 BIT(1) NOT NULL DEFAULT 0, C2
CHAR(1) NOT NULL DEFAULT 'A') ENGINE = 'MYISAM'  ;
INSERT INTO t4 SET C1 = 1;
SELECT C1,HEX(B1),HEX(B2) FROM t4;
C1	HEX(B1)	HEX(B2)
1	NULL	0
SELECT C1,HEX(B1),HEX(B2) FROM t4;
C1	HEX(B1)	HEX(B2)
1	NULL	0
DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6;


--- 1.24/mysql-test/t/rpl_replicate_do.test	2005-09-10 13:42:29 +02:00
+++ 1.25/mysql-test/t/rpl_replicate_do.test	2005-09-12 01:11:56 +02:00
@@ -1,6 +1,6 @@
 # This test assumes we are ignoring updates on table t2, but doing
 # updates on t1
-# Currently casues slave to crash bug#12421
+# Currently casues slave to produce wrong result bug#12421
 --source include/have_binlog_format_statement.inc
 source include/master-slave.inc;
 --disable_warnings