Merged from main 5.1

mysql-test/r/alter_table.result

@@ -1030,6 +1030,7 @@ select * from t2;
 c
 NULL
 1
+Two
 Three
 lock table t2 write, t3 read;
 alter table t2 change c vc varchar(100) default "Four", rename to t1;
@@ -1046,6 +1047,7 @@ select * from t1;
 vc
 NULL
 1
+Two
 Three
 Four
 drop tables t1, t3;

mysql-test/r/rpl_events.result

@@ -122,13 +122,15 @@ SELECT * FROM t1 ORDER BY id;
 id	c	ts
 1	manually	TIMESTAMP
 2	from justonce	TIMESTAMP
-affected rows: 2
+4	from er	TIMESTAMP
+affected rows: 3
 "Checking event data on the slave"
 SELECT * FROM t1 ORDER BY id;
 id	c	ts
 1	manually	TIMESTAMP
 2	from justonce	TIMESTAMP
-affected rows: 2
+4	from er	TIMESTAMP
+affected rows: 3
 "Checking event is inactive on slave"
 SELECT db, name, status, originator FROM mysql.event WHERE db = 'test' AND name = 'justonce';
 db	name	status	originator