Commit 9ed3da2c authored by acurtis/antony@ltamd64.xiphis.org's avatar acurtis/antony@ltamd64.xiphis.org
Browse files

Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines 

into  xiphis.org:/anubis/antony/work/merge.20080220/mysql-5.0
parents 921e1cc4 a4d8864b

mysql-test/r/ndb_alter_table2.result

+19 −0
Original line number Diff line number Diff line
@@ -40,3 +40,22 @@ a b c 
select * from t1;

a	b	c

drop table t1;

DROP TABLE IF EXISTS truncate_test;

CREATE TABLE truncate_test (

i INT PRIMARY KEY,

a INT,

b VARCHAR(11),

UNIQUE KEY (a) 

) ENGINE = NDB;

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

TRUNCATE truncate_test;

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

SELECT * FROM truncate_test;

i	a	b

1	1	test

INSERT INTO truncate_test VALUES (1, 1, 'test') ON DUPLICATE KEY UPDATE b = 'new';

SELECT * FROM truncate_test;

i	a	b

1	1	new

DROP TABLE truncate_test;

mysql-test/r/ndb_auto_increment.result

+3 −3
Original line number Diff line number Diff line
@@ -421,10 +421,10 @@ select * from t1 order by a; 
a

1

20

21

33

34

35

65

insert into t1 values (100);

insert into t1 values (NULL);

insert into t1 values (NULL);
@@ -432,11 +432,11 @@ select * from t1 order by a; 
a

1

20

21

22

33

34

35

65

66

100

101

set auto_increment_offset = @old_auto_increment_offset;

mysql-test/r/ndb_bug31477.result

0 → 100644
+98 −0
Original line number Diff line number Diff line 
drop table if exists t1;

create table t1(a int primary key, b int, c int, unique(b)) engine = ndb;

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

insert into t1 values (3,3,3);

insert into t1 values (4,4,4);

begin;

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

begin;

update t1 set c = 2 where b = 1;

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

rollback;

rollback;

drop table t1;

create table t1(a int primary key, b int, c int, key(b)) engine = ndb;

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

insert into t1 values (3,3,3);

insert into t1 values (4,4,4);

begin;

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

begin;

update t1 set c = 2 where b = 1;

ERROR HY000: Lock wait timeout exceeded; try restarting transaction

rollback;

rollback;

drop table t1;

--con1

create table t1(a int primary key, b int, c int, key(b)) engine = ndb;

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

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

insert into t1 values (3,3,3);

insert into t1 values (4,4,4);

begin;

update t1 set c = 10 where a = 1;

update t1 set c = 20 where a = 1;

update t1 set c = 30 where a = 1;

--con1 c=30

select * from t1 where b >= 1 order by b;

a	b	c

1	1	30

2	2	2

3	3	3

4	4	4

--con2 c=1

select * from t1 where b >= 1 order by b;

a	b	c

1	1	1

2	2	2

3	3	3

4	4	4

--con1

delete from t1 where a = 1;

--con1 c=none

select * from t1 where b >= 1 order by b;

a	b	c

2	2	2

3	3	3

4	4	4

--con2 c=1

select * from t1 where b >= 1 order by b;

a	b	c

1	1	1

2	2	2

3	3	3

4	4	4

--con1

commit;

--con1 c=none

select * from t1 where b >= 1 order by b;

a	b	c

2	2	2

3	3	3

4	4	4

--con2 c=none

select * from t1 where b >= 1 order by b;

a	b	c

2	2	2

3	3	3

4	4	4

--con1

begin;

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

update t1 set c = 10 where a = 1;

update t1 set c = 20 where a = 1;

update t1 set c = 30 where a = 1;

--con1 c=30

select * from t1 where b >= 1 order by b;

a	b	c

1	1	30

2	2	2

3	3	3

4	4	4

--con2 c=none

select * from t1 where b >= 1 order by b;

a	b	c

2	2	2

3	3	3

4	4	4

drop table t1;

mysql-test/r/ndb_condition_pushdown.result

+6 −0
Original line number Diff line number Diff line
@@ -1904,6 +1904,12 @@ a b d 
10	1	4369

20	2	8738

50	5	21845

-- big filter just below limit

a	b	d

10	1	4369

20	2	8738

50	5	21845

-- big filter just above limit

a	b	d

10	1	4369

20	2	8738

mysql-test/r/ndb_restore.result

+35 −15
Original line number Diff line number Diff line
@@ -266,21 +266,41 @@ a 
2000

3000

10000

show table status like 't1_c';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

X	X	X	X	X	X	X	X	X	X	3001	X	X	X	X	X	X	X

show table status like 't2_c';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

X	X	X	X	X	X	X	X	X	X	501	X	X	X	X	X	X	X

show table status like 't4_c';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

X	X	X	X	X	X	X	X	X	X	290000001	X	X	X	X	X	X	X

show table status like 't7_c';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

X	X	X	X	X	X	X	X	X	X	29	X	X	X	X	X	X	X

show table status like 't10_c';

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

X	X	X	X	X	X	X	X	X	X	10001	X	X	X	X	X	X	X

select max(capgoaledatta) from t1_c;

max(capgoaledatta)

3000

select auto_increment from information_schema.tables

where table_name = 't1_c';

auto_increment

3001

select max(capgotod) from t2_c;

max(capgotod)

500

select auto_increment from information_schema.tables

where table_name = 't2_c';

auto_increment

501

select max(capfa) from t4_c;

max(capfa)

290000000

select auto_increment from information_schema.tables

where table_name = 't4_c';

auto_increment

290000001

select max(dardtestard) from t7_c;

max(dardtestard)

28

select auto_increment from information_schema.tables

where table_name = 't7_c';

auto_increment

29

select max(a) from t10_c;

max(a)

10000

select auto_increment from information_schema.tables

where table_name = 't10_c';

auto_increment

10001

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9, t10;

drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c, t10_c;

520093696,<the_backup_id>