Commit 9639b35a authored by unknown's avatar unknown
Browse files

Merge siva.hindu.god:/usr/home/tim/m/bk/50-build 

into  siva.hindu.god:/usr/home/tim/m/bk/51-build


cmd-line-utils/readline/histfile.c:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/udf_example.c:
  Auto merged
storage/innobase/include/row0mysql.h:
  Auto merged
strings/decimal.c:
  Auto merged
mysql-test/include/mix1.inc:
  Manual merge
mysql-test/r/func_str.result:
  Manual merge
mysql-test/r/innodb_mysql.result:
  Manual merge
mysql-test/t/disabled.def:
  Manual merge
mysql-test/t/func_str.test:
  Manual merge
sql/mysqld.cc:
  Manual merge
storage/innobase/handler/ha_innodb.cc:
  Manual merge
storage/innobase/handler/ha_innodb.h:
  Manual merge
storage/innobase/row/row0mysql.c:
  Manual merge
parents 7ae6af4e b8550ca1

mysql-test/include/innodb_rollback_on_timeout.inc

0 → 100644
+37 −0
Original line number Diff line number Diff line 
#

# Bug #24200: Provide backwards compatibility mode for 4.x "rollback on

# transaction timeout"

#

show variables like 'innodb_rollback_on_timeout';

create table t1 (a int unsigned not null primary key) engine = innodb;

insert into t1 values (1);

commit;

connect (con1,localhost,root,,);

connect (con2,localhost,root,,);



connection con2;

begin work;

insert into t1 values (2);

select * from t1;



connection con1;

begin work;

insert into t1 values (5);

select * from t1;

# Lock wait timeout set to 2 seconds in <THIS TEST>-master.opt; this

# statement will time out; in 5.0.13+, it will not roll back transaction.

--error ER_LOCK_WAIT_TIMEOUT

insert into t1 values (2);

# On 5.0.13+, this should give ==> 1, 5

select * from t1;

commit;



connection con2;

select * from t1;

commit;



connection default;

select * from t1;

drop table t1;

disconnect con1;

disconnect con2;

mysql-test/include/mix1.inc

+2 −0
Original line number Diff line number Diff line
@@ -462,6 +462,8 @@ EXPLAIN SELECT b, SUM(c) FROM t1 GROUP BY b; 
EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b;

DROP TABLE t1;



--source include/innodb_rollback_on_timeout.inc



--echo End of 5.0 tests

mysql-test/r/func_str.result

+12 −0
Original line number Diff line number Diff line
@@ -2249,4 +2249,16 @@ CHAR(0xff,0x8f USING utf8) IS NULL 
Warnings:

Error	1300	Invalid utf8 character string: 'FF8F'

SET SQL_MODE=@orig_sql_mode;

select substring('abc', cast(2 as unsigned int));

substring('abc', cast(2 as unsigned int))

bc

select repeat('a', cast(2 as unsigned int));

repeat('a', cast(2 as unsigned int))

aa

select rpad('abc', cast(5 as unsigned integer), 'x');

rpad('abc', cast(5 as unsigned integer), 'x')

abcxx

select lpad('abc', cast(5 as unsigned integer), 'x');

lpad('abc', cast(5 as unsigned integer), 'x')

xxabc

End of 5.0 tests

mysql-test/r/innodb_mysql.result

+36 −0
Original line number Diff line number Diff line
@@ -403,6 +403,42 @@ EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b; 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	128	Using filesort

DROP TABLE t1;

show variables like 'innodb_rollback_on_timeout';

Variable_name	Value

innodb_rollback_on_timeout	OFF

create table t1 (a int unsigned not null primary key) engine = innodb;

insert into t1 values (1);

commit;

begin work;

insert into t1 values (2);

select * from t1;

a

1

2

begin work;

insert into t1 values (5);

select * from t1;

a

1

5

insert into t1 values (2);

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

select * from t1;

a

1

5

commit;

select * from t1;

a

1

2

commit;

select * from t1;

a

1

2

5

drop table t1;

End of 5.0 tests

CREATE TABLE `t2` (

`k` int(11) NOT NULL auto_increment,

mysql-test/r/innodb_timeout_rollback.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
show variables like 'innodb_rollback_on_timeout';

Variable_name	Value

innodb_rollback_on_timeout	ON

create table t1 (a int unsigned not null primary key) engine = innodb;

insert into t1 values (1);

commit;

begin work;

insert into t1 values (2);

select * from t1;

a

1

2

begin work;

insert into t1 values (5);

select * from t1;

a

1

5

insert into t1 values (2);

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

select * from t1;

a

1

commit;

select * from t1;

a

1

2

commit;

select * from t1;

a

1

2

drop table t1;

End of 5.0 tests