Commit 9ae442c3 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  eel.(none):/home/jonas/src/mysql-5.0-push
parents 81a54a79 1568be58

innobase/btr/btr0sea.c

+7 −0
Original line number Diff line number Diff line
@@ -964,6 +964,13 @@ btr_search_drop_page_hash_index( 
	heap = NULL;

	offsets = NULL;



	if (block->index == NULL) {



		mem_analyze_corruption((byte*)block);



		ut_a(block->index != NULL);

	}



	while (!page_rec_is_supremum(rec)) {

		/* FIXME: in a mixed tree, not all records may have enough

		ordering fields: */

mysql-test/r/row.result

+7 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ SELECT (1,2,3)=(1,NULL,3); 
NULL

SELECT (1,2,3)=(1,NULL,0);

(1,2,3)=(1,NULL,0)

NULL

0

SELECT ROW(1,2,3)=ROW(1,2,3);

ROW(1,2,3)=ROW(1,2,3)

1
@@ -175,3 +175,9 @@ ROW(2,10) <=> ROW(3,4) 
SELECT ROW(NULL,10) <=> ROW(3,NULL);

ROW(NULL,10) <=> ROW(3,NULL)

0

SELECT ROW(1,1,1) = ROW(1,1,1) as `1`, ROW(1,1,1) = ROW(1,2,1) as `0`, ROW(1,NULL,1) = ROW(2,2,1) as `0`, ROW(1,NULL,1) = ROW(1,2,2) as `0`, ROW(1,NULL,1) = ROW(1,2,1) as `null` ;

1	0	0	0	null

1	0	0	0	NULL

select row(NULL,1)=(2,0);

row(NULL,1)=(2,0)

0

mysql-test/r/rpl_delete_all.result

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ drop database if exists mysqltest; 
Warnings:

Note	1008	Can't drop database 'mysqltest'; database doesn't exist

show tables from mysqltest;

ERROR HY000: Can't read dir of './mysqltest/' (Errcode: X)

ERROR 42000: Unknown database 'mysqltest'

create table t1 (a int);

drop table if exists t1;

Warnings:

mysql-test/r/subselect.result

+2 −2
Original line number Diff line number Diff line
@@ -923,7 +923,7 @@ select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,2,'a'),(select c from t 
a	(select a,b,c from t1 where t1.a=t2.a) = ROW(a,2,'a')	(select c from t1 where a=t2.a)

1	1	a

2	0	b

NULL	NULL	NULL

NULL	0	NULL

select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,3,'b'),(select c from t1 where a=t2.a) from t2;

a	(select a,b,c from t1 where t1.a=t2.a) = ROW(a,3,'b')	(select c from t1 where a=t2.a)

1	0	a
@@ -933,7 +933,7 @@ select a, (select a,b,c from t1 where t1.a=t2.a) = ROW(a,4,'c'),(select c from t 
a	(select a,b,c from t1 where t1.a=t2.a) = ROW(a,4,'c')	(select c from t1 where a=t2.a)

1	0	a

2	0	b

NULL	NULL	NULL

NULL	0	NULL

drop table t1,t2;

create table t1 (a int, b real, c varchar(10));

insert into t1 values (1, 1, 'a'), (2,2,'b'), (NULL, 2, 'b');

mysql-test/t/row.test

+6 −0
Original line number Diff line number Diff line
@@ -86,3 +86,9 @@ SELECT ROW(2,10) <=> ROW(3,4); 
SELECT ROW(NULL,10) <=> ROW(3,NULL);



# End of 4.1 tests



#

# Correct NULL handling in row comporison (BUG#12509)

#

SELECT ROW(1,1,1) = ROW(1,1,1) as `1`, ROW(1,1,1) = ROW(1,2,1) as `0`, ROW(1,NULL,1) = ROW(2,2,1) as `0`, ROW(1,NULL,1) = ROW(1,2,2) as `0`, ROW(1,NULL,1) = ROW(1,2,1) as `null` ;

select row(NULL,1)=(2,0);