Commit e900d9fc authored by Mats Kindahl's avatar Mats Kindahl
Browse files

Merging with 5.1-5.1.29-rc

parents 97f26481 adf630dc

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ AC_CANONICAL_SYSTEM 
#

# When changing major version number please also check switch statement

# in mysqlbinlog::check_master_version().

AM_INIT_AUTOMAKE(mysql, 5.1.29)

AM_INIT_AUTOMAKE(mysql, 5.1.30)

AM_CONFIG_HEADER([include/config.h:config.h.in])



PROTOCOL_VERSION=10

mysql-test/r/alter_table.result

+12 −0
Original line number Diff line number Diff line
@@ -1222,4 +1222,16 @@ ALTER TABLE t1 CHANGE d c varchar(10); 
affected rows: 0

info: Records: 0  Duplicates: 0  Warnings: 0

DROP TABLE t1;

CREATE TABLE t1(a INT AUTO_INCREMENT PRIMARY KEY, 

b ENUM('a', 'b', 'c') NOT NULL);

INSERT INTO t1 (b) VALUES ('a'), ('c'), ('b'), ('b'), ('a');

ALTER TABLE t1 MODIFY b ENUM('a', 'z', 'b', 'c') NOT NULL;

SELECT * FROM t1;

a	b

1	a

2	c

3	b

4	b

5	a

DROP TABLE t1;

End of 5.1 tests

mysql-test/r/binlog_format_basic.result

+3 −0
Original line number Diff line number Diff line 
SELECT @@GLOBAL.binlog_format;

@@GLOBAL.binlog_format

STATEMENT

'#---------------------BS_STVARS_002_01----------------------#'

SELECT COUNT(@@GLOBAL.binlog_format);

COUNT(@@GLOBAL.binlog_format)

mysql-test/r/xa.result

+20 −0
Original line number Diff line number Diff line
@@ -55,3 +55,23 @@ select * from t1; 
a

20

drop table t1;

drop table if exists t1;

create table t1(a int, b int, c varchar(20), primary key(a)) engine = innodb;

insert into t1 values(1, 1, 'a');

insert into t1 values(2, 2, 'b');

xa start 'a','b';

update t1 set c = 'aa' where a = 1;

xa start 'a','c';

update t1 set c = 'bb' where a = 2;

update t1 set c = 'bb' where a = 2;

update t1 set c = 'aa' where a = 1;

ERROR 40001: Deadlock found when trying to get lock; try restarting transaction

select count(*) from t1;

count(*)

2

xa end 'a','c';

ERROR XA102: XA_RBDEADLOCK: Transaction branch was rolled back: deadlock was detected

xa rollback 'a','c';

xa start 'a','c';

drop table t1;

End of 5.0 tests

mysql-test/t/alter_table.test

+12 −0
Original line number Diff line number Diff line
@@ -947,4 +947,16 @@ ALTER TABLE t1 CHANGE d c varchar(10); 
--disable_info

DROP TABLE t1;





#

# Bug #23113: Different behavior on altering ENUM fields between 5.0 and 5.1

#

CREATE TABLE t1(a INT AUTO_INCREMENT PRIMARY KEY, 

  b ENUM('a', 'b', 'c') NOT NULL);

INSERT INTO t1 (b) VALUES ('a'), ('c'), ('b'), ('b'), ('a');

ALTER TABLE t1 MODIFY b ENUM('a', 'z', 'b', 'c') NOT NULL;

SELECT * FROM t1;

DROP TABLE t1;





--echo End of 5.1 tests