Commit 7e0f4a6f authored by mkindahl@dl145h.mysql.com's avatar mkindahl@dl145h.mysql.com
Browse files

Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl 

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl
parents ccd53222 a25028ef

include/my_base.h

+3 −1
Original line number Diff line number Diff line
@@ -419,7 +419,9 @@ enum ha_base_keytype { 
                                            statement */

#define HA_ERR_CORRUPT_EVENT      171    /* The event was corrupt, leading to

                                            illegal data being read */

#define HA_ERR_LAST              171     /*Copy last error nr.*/

#define HA_ERR_ROWS_EVENT_APPLY   172    /* The event could not be processed

                                            no other hanlder error happened */

#define HA_ERR_LAST              172     /*Copy last error nr.*/

/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

mysql-test/extra/rpl_tests/rpl_row_tabledefs.test

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ ALTER TABLE t1_bit 
ALTER TABLE t1_char ADD x CHAR(20) DEFAULT 'Just a test';

# ... and add one non-nullable INT column last in table 't1_text'

#     with no default,

ALTER TABLE t1_nodef ADD x INT NOT NULL;

ALTER TABLE t1_nodef ADD x INT NOT NULL, ADD y INT NOT NULL, ADD z INT NOT NULL;

# ... and remove the last column in t2

ALTER TABLE t2 DROP b;

# ... change the type of the single column in table 't4'
@@ -222,8 +222,8 @@ sync_slave_with_master; 


--echo **** On Slave ****

connection slave;

INSERT INTO t1_nodef VALUES (1,2,3);

INSERT INTO t1_nodef VALUES (2,4,6);

INSERT INTO t1_nodef VALUES (1,2,3,4,5);

INSERT INTO t1_nodef VALUES (2,4,6,8,10);



--echo **** On Master ****

connection master;

mysql-test/suite/binlog/r/binlog_old_versions.result

+10 −0
Original line number Diff line number Diff line
@@ -29,6 +29,16 @@ SELECT COUNT(*) FROM t3; 
COUNT(*)

17920

DROP TABLE t1, t2, t3;

==== Read binlog from version 4.1 ====

SELECT * FROM t1 ORDER BY a;

a	b

0	last_insert_id

4	four

190243	random

SELECT COUNT(*) FROM t3;

COUNT(*)

17920

DROP TABLE t1, t3;

==== Read binlog from alcatel tree (mysql-5.1-wl2325-5.0-drop6) ====

SELECT * FROM t1 ORDER BY a;

a	b

mysql-test/suite/binlog/std_data/binlog_old_version_4_1.000001

0 → 100644
+146 KiB

File added.

No diff preview for this file type.

View file

mysql-test/suite/binlog/t/binlog_old_versions.test

+15 −0
Original line number Diff line number Diff line
@@ -52,6 +52,21 @@ SELECT COUNT(*) FROM t3; 
DROP TABLE t1, t2, t3;





--echo ==== Read binlog from version 4.1 ====



# In this version, neither row-based binlogging nor Xid events

# existed, so the binlog was generated without the "row-based tests"

# part and the "get xid event" part, and it does not create table t2.



# Read binlog.

--exec $MYSQL_BINLOG suite/binlog/std_data/binlog_old_version_4_1.000001 | $MYSQL

# Show result.

SELECT * FROM t1 ORDER BY a;

SELECT COUNT(*) FROM t3;

# Reset.

DROP TABLE t1, t3;





--echo ==== Read binlog from alcatel tree (mysql-5.1-wl2325-5.0-drop6) ====



# In this version, it was not possible to switch between row-based and