Commit 7ff604eb authored by kostja@vajra.(none)'s avatar kostja@vajra.(none)
Browse files

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

into  vajra.(none):/opt/local/work/mysql-5.0-runtime
parents 7d006ee5 dcf7be8c

mysql-test/r/create.result

+94 −0
Original line number Diff line number Diff line
@@ -769,6 +769,100 @@ t1 CREATE TABLE `t1` ( 
  `i` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295

drop table t1;

create table t1 select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

create table t1 select * from t1;

ERROR HY000: You can't specify target table 't1' for update in FROM clause

create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin);

ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'coalesce'

create table t1 (primary key(a)) select "b" as b;

ERROR 42000: Key column 'a' doesn't exist in table

create table t1 (a int);

create table if not exists t1 select 1 as a, 2 as b;

ERROR 21S01: Column count doesn't match value count at row 1

drop table t1;

create table t1 (primary key (a)) (select 1 as a) union all (select 1 as a);

ERROR 23000: Duplicate entry '1' for key 1

create table t1 (i int);

create table t1 select 1 as i;

ERROR 42S01: Table 't1' already exists

create table if not exists t1 select 1 as i;

Warnings:

Note	1050	Table 't1' already exists

select * from t1;

i

1

create table t1 select coalesce('a' collate latin1_swedish_ci,'b' collate latin1_bin);

ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'coalesce'

select * from t1;

i

1

alter table t1 add primary key (i);

create table if not exists t1 (select 2 as i) union all (select 2 as i);

ERROR 23000: Duplicate entry '2' for key 1

select * from t1;

i

1

2

drop table t1;

create temporary table t1 (j int);

create table if not exists t1 select 1;

Warnings:

Note	1050	Table 't1' already exists

select * from t1;

j

1

drop temporary table t1;

select * from t1;

ERROR 42S02: Table 'test.t1' doesn't exist

drop table t1;

ERROR 42S02: Unknown table 't1'

create table t1 (i int);

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

lock tables t1 read;

create table t2 select * from t1;

ERROR HY000: Table 't2' was not locked with LOCK TABLES

create table if not exists t2 select * from t1;

ERROR HY000: Table 't2' was not locked with LOCK TABLES

unlock tables;

create table t2 (j int);

lock tables t1 read;

create table t2 select * from t1;

ERROR HY000: Table 't2' was not locked with LOCK TABLES

create table if not exists t2 select * from t1;

ERROR HY000: Table 't2' was not locked with LOCK TABLES

unlock tables;

lock table t1 read, t2 read;

create table t2 select * from t1;

ERROR HY000: Table 't2' was locked with a READ lock and can't be updated

create table if not exists t2 select * from t1;

ERROR HY000: Table 't2' was locked with a READ lock and can't be updated

unlock tables;

lock table t1 read, t2 write;

create table t2 select * from t1;

ERROR 42S01: Table 't2' already exists

create table if not exists t2 select * from t1;

Warnings:

Note	1050	Table 't2' already exists

select * from t1;

i

1

2

unlock tables;

drop table t2;

lock tables t1 read;

create temporary table t2 select * from t1;

create temporary table if not exists t2 select * from t1;

Warnings:

Note	1050	Table 't2' already exists

select * from t2;

i

1

2

1

2

unlock tables;

drop table t1, t2;

create table t1 (upgrade int);

drop table t1;

End of 5.0 tests

mysql-test/r/ps.result

+3 −3
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ ERROR HY000: Unknown prepared statement handler (no_such_statement) given to DEA 
execute stmt1;

ERROR HY000: Incorrect arguments to EXECUTE

prepare stmt2 from 'prepare nested_stmt from "select 1"';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '"select 1"' at line 1

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt2 from 'execute stmt1';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'stmt1' at line 1

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt2 from 'deallocate prepare z';

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'z' at line 1

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt3 from 'insert into t1 values (?,?)';

set @arg1=5, @arg2='five';

execute stmt3 using @arg1, @arg2;

mysql-test/r/ps_1general.result

+3 −3
Original line number Diff line number Diff line
@@ -391,11 +391,11 @@ drop table t5 ; 
deallocate prepare stmt_do ;

deallocate prepare stmt_set ;

prepare stmt1 from ' prepare stmt2 from '' select 1 ''  ' ;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '' select 1 '' at line 1

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' execute stmt2 ' ;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'stmt2' at line 1

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt1 from ' deallocate prepare never_prepared ' ;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'never_prepared' at line 1

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt4 from ' use test ' ;

ERROR HY000: This command is not supported in the prepared statement protocol yet

prepare stmt3 from ' create database mysqltest ';

mysql-test/r/query_cache.result

+94 −0
Original line number Diff line number Diff line
@@ -1315,3 +1315,97 @@ insert into t1(c1) select c1 from v1; 
drop table t1, t2, t3;

drop view v1;

set global query_cache_size=0;

create table t1 (a int);

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

set GLOBAL query_cache_type=1;

set GLOBAL query_cache_limit=10000;

set GLOBAL query_cache_min_res_unit=0;

set GLOBAL query_cache_size= 100000;

reset query cache;

set LOCAL default_week_format = 0;

select week('2007-01-04');

week('2007-01-04')

0

select week('2007-01-04') from t1;

week('2007-01-04')

0

0

0

select extract(WEEK FROM '2007-01-04') from t1;

extract(WEEK FROM '2007-01-04')

0

0

0

set LOCAL default_week_format = 2;

select week('2007-01-04');

week('2007-01-04')

53

select week('2007-01-04') from t1;

week('2007-01-04')

53

53

53

select extract(WEEK FROM '2007-01-04') from t1;

extract(WEEK FROM '2007-01-04')

53

53

53

reset query cache;

set LOCAL div_precision_increment=2;

select 1/7;

1/7

0.14

select 1/7 from t1;

1/7

0.14

0.14

0.14

set LOCAL div_precision_increment=4;

select 1/7;

1/7

0.1429

select 1/7 from t1;

1/7

0.1429

0.1429

0.1429

drop table t1;

CREATE TABLE t1 (a VARCHAR(200), b TEXT, FULLTEXT (a,b));

INSERT INTO t1 VALUES('MySQL has now support', 'for full-text search'),

('Full-text indexes', 'are called collections'),

('Only MyISAM tables','support collections'),

('Function MATCH ... AGAINST()','is used to do a search'),

('Full-text search in MySQL', 'implements vector space model');

set GLOBAL ft_boolean_syntax='+ -><()~*:""&|';

select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;

a	b	x

MySQL has now support	for full-text search	0

Full-text indexes	are called collections	1

Only MyISAM tables	support collections	0

Function MATCH ... AGAINST()	is used to do a search	0

Full-text search in MySQL	implements vector space model	0

set GLOBAL ft_boolean_syntax='- +><()~*:""&|';

select *, MATCH(a,b) AGAINST("+called +collections" IN BOOLEAN MODE) as x from t1;

a	b	x

MySQL has now support	for full-text search	0

Full-text indexes	are called collections	0

Only MyISAM tables	support collections	0

Function MATCH ... AGAINST()	is used to do a search	0

Full-text search in MySQL	implements vector space model	0

create function change_global() returns integer

begin

set global ft_boolean_syntax='+ -><()~*:""&|';

return 1;

end|

select *, change_global() from t1;

a	b	change_global()

MySQL has now support	for full-text search	1

Full-text indexes	are called collections	1

Only MyISAM tables	support collections	1

Function MATCH ... AGAINST()	is used to do a search	1

Full-text search in MySQL	implements vector space model	1

drop function change_global;

set GLOBAL query_cache_type=default;

set GLOBAL query_cache_limit=default;

set GLOBAL query_cache_min_res_unit=default;

set GLOBAL query_cache_size= default;

mysql-test/r/sp-code.result

+113 −0
Original line number Diff line number Diff line
@@ -620,4 +620,117 @@ SHOW PROCEDURE CODE p1; 
Pos	Instruction

0	stmt 2 "CREATE INDEX idx ON t1 (c1)"

DROP PROCEDURE p1;

drop table if exists t1;

drop procedure if exists proc_26977_broken;

drop procedure if exists proc_26977_works;

create table t1(a int unique);

create procedure proc_26977_broken(v int)

begin

declare i int default 5;

declare continue handler for sqlexception

begin

select 'caught something';

retry:

while i > 0 do

begin

set i = i - 1;

select 'looping', i;

end;

end while retry;

end;

select 'do something';

insert into t1 values (v);

select 'do something again';

insert into t1 values (v);

end//

create procedure proc_26977_works(v int)

begin

declare i int default 5;

declare continue handler for sqlexception

begin

select 'caught something';

retry:

while i > 0 do

begin

set i = i - 1;

select 'looping', i;

end;

end while retry;

select 'optimizer: keep hreturn';

end;

select 'do something';

insert into t1 values (v);

select 'do something again';

insert into t1 values (v);

end//

show procedure code proc_26977_broken;

Pos	Instruction

0	set i@1 5

1	hpush_jump 8 2 CONTINUE

2	stmt 0 "select 'caught something'"

3	jump_if_not 7(7) (i@1 > 0)

4	set i@1 (i@1 - 1)

5	stmt 0 "select 'looping', i"

6	jump 3

7	hreturn 2

8	stmt 0 "select 'do something'"

9	stmt 5 "insert into t1 values (v)"

10	stmt 0 "select 'do something again'"

11	stmt 5 "insert into t1 values (v)"

12	hpop 1

show procedure code proc_26977_works;

Pos	Instruction

0	set i@1 5

1	hpush_jump 9 2 CONTINUE

2	stmt 0 "select 'caught something'"

3	jump_if_not 7(7) (i@1 > 0)

4	set i@1 (i@1 - 1)

5	stmt 0 "select 'looping', i"

6	jump 3

7	stmt 0 "select 'optimizer: keep hreturn'"

8	hreturn 2

9	stmt 0 "select 'do something'"

10	stmt 5 "insert into t1 values (v)"

11	stmt 0 "select 'do something again'"

12	stmt 5 "insert into t1 values (v)"

13	hpop 1

call proc_26977_broken(1);

do something

do something

do something again

do something again

caught something

caught something

looping	i

looping	4

looping	i

looping	3

looping	i

looping	2

looping	i

looping	1

looping	i

looping	0

call proc_26977_works(2);

do something

do something

do something again

do something again

caught something

caught something

looping	i

looping	4

looping	i

looping	3

looping	i

looping	2

looping	i

looping	1

looping	i

looping	0

optimizer: keep hreturn

optimizer: keep hreturn

drop table t1;

drop procedure proc_26977_broken;

drop procedure proc_26977_works;

End of 5.0 tests.