Commit 7e1e2280 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-opt


sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
parents cf465f7e 6b603c9a

mysql-test/r/delete.result

+9 −0
Original line number Diff line number Diff line
@@ -214,3 +214,12 @@ select count(*) from t1; 
count(*)

0

drop table t1;

CREATE TABLE t1 (a INT);

INSERT INTO t1 VALUES (1);

DELETE FROM t1 ORDER BY x;

ERROR 42S22: Unknown column 'x' in 'order clause'

DELETE FROM t1 ORDER BY t2.x;

ERROR 42S22: Unknown column 't2.x' in 'order clause'

DELETE FROM t1 ORDER BY (SELECT x);

ERROR 42S22: Unknown column 'x' in 'field list'

DROP TABLE t1;

mysql-test/r/gis.result

+6 −0
Original line number Diff line number Diff line
@@ -730,6 +730,12 @@ point(b, b) IS NULL linestring(b) IS NULL polygon(b) IS NULL multipoint(b) IS NU 
1	1	1	1	1	1	1

0	1	1	1	1	1	1

drop table t1;

CREATE TABLE t1(a POINT) ENGINE=MyISAM;

INSERT INTO t1 VALUES (NULL);

SELECT * FROM t1;

a

NULL

DROP TABLE t1;

End of 4.1 tests

create table t1 (s1 geometry not null,s2 char(100));

create trigger t1_bu before update on t1 for each row set new.s1 = null;

mysql-test/r/group_by.result

+5 −0
Original line number Diff line number Diff line
@@ -1141,4 +1141,9 @@ EXPLAIN SELECT 1 FROM t2 WHERE a IN 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	PRIMARY	t2	index	NULL	a	5	NULL	4	Using where; Using index

2	DEPENDENT SUBQUERY	t1	ALL	NULL	NULL	NULL	NULL	256	Using where

SHOW VARIABLES LIKE 'old';

Variable_name	Value

old	OFF

SET @@old = off;

ERROR HY000: Variable 'old' is a read only variable

DROP TABLE t1, t2;

mysql-test/r/range.result

+28 −0
Original line number Diff line number Diff line
@@ -717,6 +717,34 @@ d8c4177d225791924.30714720 
d8c4177d2380fc201.39666693

d8c4177d24ccef970.14957924

DROP TABLE t1;

create table t1 (

c1  char(10), c2  char(10), c3  char(10), c4  char(10),

c5  char(10), c6  char(10), c7  char(10), c8  char(10),

c9  char(10), c10 char(10), c11 char(10), c12 char(10),

c13 char(10), c14 char(10), c15 char(10), c16 char(10),

index(c1, c2, c3, c4, c5, c6, c7, c8, c9, c10, c11, c12,c13,c14,c15,c16)

);

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

select * from t1 where

c1 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c2 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c3 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c4 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c5 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c6 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c7 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c8 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c9 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c10 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c11 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c12 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c13 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c14 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c15 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

and c16 in ("abcdefgh", "123456789", "qwertyuio", "asddfgh")

;

c1	c2	c3	c4	c5	c6	c7	c8	c9	c10	c11	c12	c13	c14	c15	c16

drop table t1;

End of 4.1 tests

CREATE TABLE t1 (

id int(11) NOT NULL auto_increment,

mysql-test/r/sp-code.result

+17 −0
Original line number Diff line number Diff line
@@ -621,3 +621,20 @@ Pos Instruction 
0	stmt 2 "CREATE INDEX idx ON t1 (c1)"

DROP PROCEDURE p1;

End of 5.0 tests.

CREATE PROCEDURE p1() 

BEGIN 

DECLARE dummy int default 0;

CASE 12 

WHEN 12 

THEN SET dummy = 0;

END CASE;

END//

SHOW PROCEDURE CODE p1;

Pos	Instruction

0	set dummy@0 0

1	set_case_expr (6) 0 12

2	jump_if_not 5(6) (case_expr@0 = 12)

3	set dummy@0 0

4	jump 6

5	error 1339

DROP PROCEDURE p1;