Merged 5.1 with maria 5.1

1 files changed, 30 insertions, 16 deletions

diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 7a5ac683835..731a833dc42 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -166,6 +166,7 @@ level	id	parent_id
 1	1007	101
 optimize table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
 test.t1	optimize	status	OK
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
@@ -190,6 +191,7 @@ create table t1 (a int) engine=innodb;
 insert into t1 values (1), (2);
 optimize table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
 test.t1	optimize	status	OK
 delete from t1 where a = 1;
 select * from t1;
@@ -738,6 +740,7 @@ world	2
 hello	1
 optimize table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
 test.t1	optimize	status	OK
 show keys from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
@@ -925,7 +928,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	index	NULL	b	4	NULL	#	Using index
 explain select a,b from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	index	NULL	PRIMARY	4	NULL	#	
+1	SIMPLE	t1	index	NULL	b	4	NULL	#	Using index
 explain select a,b,c from t1;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	#	
@@ -1166,14 +1169,14 @@ UPDATE t1 set a=a+100 where b between 2 and 3 and a < 1000;
 SELECT * from t1;
 a	b
 1	1
+102	2
+103	3
 4	4
 5	5
 6	6
 7	7
 8	8
 9	9
-102	2
-103	3
 drop table t1;
 CREATE TABLE t1 (a int not null primary key, b int not null, key (b)) engine=innodb;
 CREATE TABLE t2 (a int not null primary key, b int not null, key (b)) engine=innodb;
@@ -1197,6 +1200,7 @@ a	b
 update t1,t2 set t1.a=t1.a+100 where t1.a=101;
 select * from t1;
 a	b
+201	1
 102	2
 103	3
 104	4
@@ -1208,11 +1212,10 @@ a	b
 110	10
 111	11
 112	12
-201	1
 update t1,t2 set t1.b=t1.b+10 where t1.b=2;
 select * from t1;
 a	b
-102	12
+201	1
 103	3
 104	4
 105	5
@@ -1222,34 +1225,34 @@ a	b
 109	9
 110	10
 111	11
+102	12
 112	12
-201	1
 update t1,t2 set t1.b=t1.b+2,t2.b=t1.b+10 where t1.b between 3 and 5 and t1.a=t2.a+100;
 select * from t1;
 a	b
-102	12
+201	1
 103	5
 104	6
-105	7
 106	6
+105	7
 107	7
 108	8
 109	9
 110	10
 111	11
+102	12
 112	12
-201	1
 select * from t2;
 a	b
 1	1
 2	2
-3	13
-4	14
-5	15
 6	6
 7	7
 8	8
 9	9
+3	13
+4	14
+5	15
 drop table t1,t2;
 CREATE TABLE t2 (   NEXT_T         BIGINT NOT NULL PRIMARY KEY) ENGINE=MyISAM;
 CREATE TABLE t1 (  B_ID           INTEGER NOT NULL PRIMARY KEY) ENGINE=InnoDB;
@@ -1300,11 +1303,11 @@ insert into t1 (id) values (null),(null),(null),(null),(null);
 update t1 set fk=69 where fk is null order by id limit 1;
 SELECT * from t1;
 id	fk
-1	69
 2	NULL
 3	NULL
 4	NULL
 5	NULL
+1	69
 drop table t1;
 create table t1 (a int not null, b int not null, key (a));
 insert into t1 values (1,1),(1,2),(1,3),(3,1),(3,2),(3,3),(3,1),(3,2),(3,3),(2,1),(2,2),(2,3);
@@ -1836,7 +1839,6 @@ set @a=repeat(' ',20);
 insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a));
 Warnings:
 Note	1265	Data truncated for column 'v' at row 1
-Note	1265	Data truncated for column 'c' at row 1
 select concat('*',v,'*',c,'*',t,'*') from t1;
 concat('*',v,'*',c,'*',t,'*')
 *+ *+*+ *
@@ -2438,8 +2440,8 @@ insert into t1 (b) values (1);
 replace into t1 (b) values (2), (1), (3);
 select * from t1;
 a	b
-2	2
 3	1
+2	2
 4	3
 truncate table t1;
 insert into t1 (b) values (1);
@@ -2448,8 +2450,8 @@ replace into t1 (b) values (1);
 replace into t1 (b) values (3);
 select * from t1;
 a	b
-2	2
 3	1
+2	2
 4	3
 drop table t1;
 create table t1 (rowid int not null auto_increment, val int not null,primary
@@ -3110,6 +3112,7 @@ BEGIN;
 INSERT INTO t1 VALUES (1);
 OPTIMIZE TABLE t1;
 Table	Op	Msg_type	Msg_text
+test.t1	optimize	note	Table does not support optimize, doing recreate + analyze instead
 test.t1	optimize	status	OK
 DROP TABLE t1;
 CREATE TABLE t1 (id int PRIMARY KEY, f int NOT NULL, INDEX(f)) ENGINE=InnoDB;
@@ -3264,3 +3267,14 @@ AUTO_INCREMENT
 200
 DROP TABLE t2;
 DROP TABLE t1;
+CREATE TABLE t1 (c1 int default NULL,
+c2 int default NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+TRUNCATE TABLE t1;
+affected rows: 0
+INSERT INTO t1 VALUES (1, 1), (2, 2), (3, 3), (4, 4), (5, 5);
+affected rows: 5
+info: Records: 5  Duplicates: 0  Warnings: 0
+TRUNCATE TABLE t1;
+affected rows: 0
+DROP TABLE t1;