Commit 6576b384 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/wl2930/my50-wl2930-integration
parents 4d509d2b 2bec1f7e

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=17

NDB_VERSION_BUILD=18

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/r/bdb.result

+19 −0
Original line number Diff line number Diff line
@@ -1289,6 +1289,25 @@ SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterd"); 
id

4

DROP TABLE t1;

create table t1 (a int, key(a)) engine=bdb;

create table t2 (b int, key(b)) engine=bdb;

insert into t1 values (1),(1),(2),(3),(4);

insert into t2 values (1),(5),(6),(7);

delete from t1 where (a in (select b from t2));

select count(*) from t1;

count(*)

3

insert into t1 set a=(select b from t2);

ERROR 21000: Subquery returns more than 1 row

select count(*) from t1;

count(*)

3

update t1 set a = a + 1 where (a in (select b from t2));

select count(*) from t1;

count(*)

3

drop table t1, t2;

End of 4.1 tests

create temporary table t1 (a int, primary key(a)) engine=bdb;

select * from t1;

a

mysql-test/r/rpl_until.result

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ n 
4

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	319	#	Master	master-bin.000001	319	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	319	#	Master	master-bin.000001	319	No						#

start slave until master_log_file='master-no-such-bin.000001', master_log_pos=291;

select * from t1;

n
@@ -41,7 +41,7 @@ n 
4

show slave status;

Slave_IO_State	Master_Host	Master_User	Master_Port	Connect_Retry	Master_Log_File	Read_Master_Log_Pos	Relay_Log_File	Relay_Log_Pos	Relay_Master_Log_File	Slave_IO_Running	Slave_SQL_Running	Replicate_Do_DB	Replicate_Ignore_DB	Replicate_Do_Table	Replicate_Ignore_Table	Replicate_Wild_Do_Table	Replicate_Wild_Ignore_Table	Last_Errno	Last_Error	Skip_Counter	Exec_Master_Log_Pos	Relay_Log_Space	Until_Condition	Until_Log_File	Until_Log_Pos	Master_SSL_Allowed	Master_SSL_CA_File	Master_SSL_CA_Path	Master_SSL_Cert	Master_SSL_Cipher	Master_SSL_Key	Seconds_Behind_Master

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	Yes	No							0		0	319	#	Master	master-no-such-bin.000001	291	No						#

#	127.0.0.1	root	MASTER_MYPORT	1	master-bin.000001	776	slave-relay-bin.000004	#	master-bin.000001	#	No							0		0	319	#	Master	master-no-such-bin.000001	291	No						#

start slave until relay_log_file='slave-relay-bin.000004', relay_log_pos=746;

select * from t2;

n

mysql-test/t/bdb.test

+19 −1
Original line number Diff line number Diff line
@@ -938,7 +938,25 @@ SELECT id FROM t1 WHERE (list_id = 1) AND (term = "lettera"); 
SELECT id FROM t1 WHERE (list_id = 1) AND (term = "letterd");

DROP TABLE t1;



# End of 4.1 tests

#

# Bug #15536: Crash when DELETE with subquery using BDB tables

#

create table t1 (a int, key(a)) engine=bdb;

create table t2 (b int, key(b)) engine=bdb;

insert into t1 values (1),(1),(2),(3),(4);

insert into t2 values (1),(5),(6),(7);

delete from t1 where (a in (select b from t2));

select count(*) from t1;

# INSERT also blows up

--error 1242

insert into t1 set a=(select b from t2);

select count(*) from t1;

# UPDATE also blows up

update t1 set a = a + 1 where (a in (select b from t2));

select count(*) from t1;

drop table t1, t2;



--echo End of 4.1 tests



#

# alter temp table

mysql-test/t/rpl_until.test

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ wait_for_slave_to_stop; 
# here table should be still not deleted

select * from t1;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 9 # 23 # 33 #

--replace_column 1 # 9 # 11 # 23 # 33 #

show slave status;



# this should fail right after start
@@ -40,7 +40,7 @@ select * from t1; 
sleep 2;

wait_for_slave_to_stop;

--replace_result $MASTER_MYPORT MASTER_MYPORT

--replace_column 1 # 9 # 23 # 33 #

--replace_column 1 # 9 # 11 # 23 # 33 #

show slave status;



# try replicate all until second insert to t2;