Commit cdd75b46 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-new 

into  mysql.com:/usr/local/mysql/tmpbuild
parents c2ed6be2 27000fb5

mysql-test/r/events.result

+18 −24
Original line number Diff line number Diff line
@@ -262,8 +262,6 @@ SHOW EVENTS; 
Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED

ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';

Warnings:

Warning	1265	Data truncated for column 'db' at row 1

SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;

ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.

ALTER TABLE mysql.event MODIFY db varchar(64) character set utf8 collate utf8_bin default '';
@@ -389,10 +387,9 @@ create event закачка on schedule every 10 hour do select get_lock("test_l 
select definer, name, db from mysql.event;

definer	name	db

root@localhost	закачка	events_test

"Should be only 1 process"

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

"Should be 0 processes"

select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

select release_lock("test_lock1");

release_lock("test_lock1")

1
@@ -409,12 +406,11 @@ get_lock("test_lock2", 20) 
"Create an event which tries to acquire a mutex. The event locks on the mutex"

create event закачка on schedule every 10 hour do select get_lock("test_lock2", 20);

"Let some time pass to the event starts"

"Should have only 3 processes: the scheduler, our conn and the locked event"

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

#	root	localhost	events_test	Connect	#	User lock	select get_lock("test_lock2", 20)

"Should have only 2 processes: the scheduler and the locked event"

select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

root	localhost	events_test	Connect	User lock	select get_lock("test_lock2", 20)

"Release the mutex, the event worker should finish."

select release_lock("test_lock2");

release_lock("test_lock2")
@@ -425,23 +421,21 @@ select get_lock("test_lock2_1", 20); 
get_lock("test_lock2_1", 20)

1

create event закачка21 on schedule every 10 hour do select get_lock("test_lock2_1", 20);

"Should see 2 processes, one locked on get_lock("

"Should see 1 process, locked on get_lock("

"Shutting down the scheduler, it should wait for the running event"

set global event_scheduler=0;

"Should have only 3 processes: the scheduler, our conn and the locked event"

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

#	root	localhost	events_test	Connect	#	User lock	select get_lock("test_lock2_1", 20)

"Should have only 2 processes: the scheduler and the locked event"

select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

root	localhost	events_test	Connect	User lock	select get_lock("test_lock2_1", 20)

"Release the lock so the child process should finish. Hence the scheduler also"

select release_lock("test_lock2_1");

release_lock("test_lock2_1")

1

"Should have only our process now:"

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

"Should see 0 processes now:"

select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

drop event закачка21;

create table t_16 (s1 int);

create trigger t_16_bi before insert on t_16 for each row create event  e_16 on schedule every 1 second do set @a=5;

mysql-test/r/events_bugs.result

+31 −34
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ CREATE EVENT Lower_case ON SCHEDULE EVERY 2 MINUTE DO SELECT 2; 
ERROR HY000: Event 'Lower_case' already exists

DROP EVENT Lower_case;

SET NAMES cp1251;

CREATE EVENT äîëåí_ðåãèñòúð_1251 ON SCHEDULE EVERY 1 YEAR DO SELECT 100;

CREATE EVENT ÄîËåÍ_ðåãèñòúð_1251 ON SCHEDULE EVERY 2 YEAR DO SELECT 200;

CREATE EVENT __1251 ON SCHEDULE EVERY 1 YEAR DO SELECT 100;

CREATE EVENT __1251 ON SCHEDULE EVERY 2 YEAR DO SELECT 200;

ERROR HY000: Event 'ДоЛеН_регистър_1251' already exists

DROP EVENT ÄîËåÍ_ðåãèñòúð_1251;

DROP EVENT __1251;

SET NAMES utf8;

CREATE EVENT долен_регистър_утф8 ON SCHEDULE EVERY 3 YEAR DO SELECT 300;

CREATE EVENT ДОЛЕН_регистър_утф8 ON SCHEDULE EVERY 4 YEAR DO SELECT 400;
@@ -50,11 +50,10 @@ select get_lock('test_bug16407', 60); 
drop table "hashed_num";

end|

"Now if everything is fine the event has compiled and is locked

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

#	root	localhost	events_test	Connect	#	User lock	select get_lock('test_bug16407', 60)

select /*1*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

root	localhost	events_test	Connect	User lock	select get_lock('test_bug16407', 60)

select release_lock('test_bug16407');

release_lock('test_bug16407')

1
@@ -75,7 +74,7 @@ create table events_smode_test(ev_name char(10), a date) engine=myisam; 
"This should never insert something"

create event ee_16407_2 on schedule every 60 second do

begin

select get_lock('ee_16407_2', 60);

select get_lock('ee_16407_2', 60) /*ee_16407_2*/;

insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');

end|

insert into events_smode_test values ('test','1980-19-02')|
@@ -83,7 +82,7 @@ ERROR 22007: Incorrect date value: '1980-19-02' for column 'a' at row 1 
"This is ok"

create event ee_16407_3 on schedule every 60 second do

begin

select get_lock('ee_16407_2', 60);

select get_lock('ee_16407_2', 60) /*ee_16407_3*/;

insert into events_test.events_smode_test values ('ee_16407_3','1980-02-19');

insert into events_test.events_smode_test values ('ee_16407_3','1980-02-29');

end|
@@ -91,7 +90,7 @@ set sql_mode=""| 
"This will insert rows but they will be truncated"

create event ee_16407_4 on schedule every 60 second do

begin

select get_lock('ee_16407_2', 60);

select get_lock('ee_16407_2', 60) /*ee_16407_4*/;

insert into events_test.events_smode_test values ('ee_16407_4','10-11-1956');

end|

select event_schema, event_name, sql_mode from information_schema.events order by event_schema, event_name;
@@ -104,20 +103,18 @@ select get_lock('ee_16407_2', 60); 
get_lock('ee_16407_2', 60)

1

set global event_scheduler= 1;

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

#	root	localhost	events_test	Connect	#	User lock	select get_lock('ee_16407_2', 60)

#	root	localhost	events_test	Connect	#	User lock	select get_lock('ee_16407_2', 60)

#	root	localhost	events_test	Connect	#	User lock	select get_lock('ee_16407_2', 60)

select /*2*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60) /*ee_16407_2*/

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60) /*ee_16407_3*/

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_2', 60) /*ee_16407_4*/

select release_lock('ee_16407_2');

release_lock('ee_16407_2')

1

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

select /*3*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

set global event_scheduler= 0;

select * from events_smode_test order by ev_name, a;

ev_name	a
@@ -140,12 +137,12 @@ create procedure ee_16407_5_pendant() begin insert into events_test.events_smode 
create procedure ee_16407_6_pendant() begin insert into events_test.events_smode_test values('ee_16407_6','2004-02-29'); end|

create event ee_16407_5 on schedule every 60 second do

begin

select get_lock('ee_16407_5', 60);

select get_lock('ee_16407_5', 60) /*ee_16407_5*/;

call events_test.ee_16407_5_pendant();

end|

create event ee_16407_6 on schedule every 60 second do

begin

select get_lock('ee_16407_5', 60);

select get_lock('ee_16407_5', 60) /*ee_16407_6*/;

call events_test.ee_16407_6_pendant();

end|

set sql_mode='ansi';
@@ -153,19 +150,19 @@ select get_lock('ee_16407_5', 60); 
get_lock('ee_16407_5', 60)

1

set global event_scheduler= 1;

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

#	root	localhost	events_test	Connect	#	User lock	select get_lock('ee_16407_5', 60)

#	root	localhost	events_test	Connect	#	User lock	select get_lock('ee_16407_5', 60)

"Should have 2 locked processes"

select /*4*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_5', 60) /*ee_16407_5*/

root	localhost	events_test	Connect	User lock	select get_lock('ee_16407_5', 60) /*ee_16407_6*/

select release_lock('ee_16407_5');

release_lock('ee_16407_5')

1

show processlist;

Id	User	Host	db	Command	Time	State	Info

#	root	localhost	events_test	Query	#	NULL	show processlist

#	event_scheduler	localhost	NULL	Connect	#	Sleeping	NULL

"Should have 0 processes locked"

select /*5*/ user, host, db, command, state, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	command	state	info

event_scheduler	localhost	NULL	Connect	Sleeping	NULL

select * from events_smode_test order by ev_name, a;

ev_name	a

ee_16407_6	2004-02-29

mysql-test/r/ndb_condition_pushdown.result

+17 −1
Original line number Diff line number Diff line
@@ -1766,5 +1766,21 @@ select * from t3 left join t4 on t4.attr2 = t3.attr2 where t4.attr1 > 1 and t4.a 
id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t3	ALL	NULL	NULL	NULL	NULL	6	Using temporary; Using filesort

1	SIMPLE	t4	ALL	NULL	NULL	NULL	NULL	6	Using where

create table t5 (a int primary key auto_increment, b tinytext not null) 

engine = ndb;

insert into t5 (b) values ('jonas'), ('jensing'), ('johan');

set engine_condition_pushdown = off;

select * from t5 where b like '%jo%' order by a;

a	b

1	jonas

3	johan

set engine_condition_pushdown = on;

explain select * from t5 where b like '%jo%';

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t5	ALL	NULL	NULL	NULL	NULL	3	Using where

select * from t5 where b like '%jo%' order by a;

a	b

1	jonas

3	johan

set engine_condition_pushdown = @old_ecpd;

DROP TABLE t1,t2,t3,t4;
 
DROP TABLE t1,t2,t3,t4,t5;

mysql-test/r/ndb_insert.result

+16 −0
Original line number Diff line number Diff line
@@ -629,7 +629,23 @@ DELETE FROM t1; 
CREATE UNIQUE INDEX ai ON t1(a);

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (1);

INSERT IGNORE INTO t1 VALUES (NULL),(2);

SELECT * FROM t1 ORDER BY a;

a

NULL

1

2

DROP TABLE t1;

CREATE TABLE t1(pk INT NOT NULL PRIMARY KEY, a INT, UNIQUE (a)) ENGINE=ndb;

INSERT IGNORE INTO t1 VALUES (1,1),(2,2),(3,3);

INSERT IGNORE INTO t1 VALUES (4,NULL),(5,NULL),(6,NULL),(7,4);

SELECT * FROM t1 ORDER BY pk;

pk	a

1	1

2	2

3	3

4	NULL

5	NULL

6	NULL

7	4

DROP TABLE t1;

mysql-test/r/partition.result

+101 −0
Original line number Diff line number Diff line
@@ -718,4 +718,105 @@ CALL test.p1(13); 
Warnings:

Warning	1196	Some non-transactional changed tables couldn't be rolled back

drop table t1;

create table t1 (f1 integer) partition by range(f1)

(partition p1 values less than (0), partition p2 values less than (10));

insert into t1 set f1 = null;

select * from t1 where f1 is null;

f1

NULL

explain partitions select * from t1 where f1 is null;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p1	system	NULL	NULL	NULL	NULL	1	

drop table t1;

create table t1 (f1 integer) partition by list(f1)

(partition p1 values in (1), partition p2 values in (null));

insert into t1 set f1 = null;

insert into t1 set f1 = 1;

select * from t1 where f1 is null or f1 = 1;

f1

1

NULL

drop table t1;

create table t1 (f1 smallint)

partition by list (f1) (partition p0 values in (null));

insert into t1 values (null);

select * from t1 where f1 is null;

f1

NULL

drop table t1;

create table t1 (f1 smallint)

partition by range (f1) (partition p0 values less than (0));

insert into t1 values (null);

select * from t1 where f1 is null;

f1

NULL

drop table t1;

create table t1 (f1 integer) partition by list(f1)

(

partition p1 values in (1),

partition p2 values in (NULL),

partition p3 values in (2),

partition p4 values in (3),

partition p5 values in (4)

);

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

select * from t1 where f1 < 3;

f1

1

2

explain partitions select * from t1 where f1 < 3;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p1,p3	ALL	NULL	NULL	NULL	NULL	2	Using where

select * from t1 where f1 is null;

f1

NULL

explain partitions select * from t1 where f1 is null;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p2	system	NULL	NULL	NULL	NULL	1	

drop table t1;

create table t1 (f1 int) partition by list(f1 div 2)

(

partition p1 values in (1),

partition p2 values in (NULL),

partition p3 values in (2),

partition p4 values in (3),

partition p5 values in (4)

);

insert into t1 values (2),(4),(6),(8),(null);

select * from t1 where f1 < 3;

f1

2

explain partitions select * from t1 where f1 < 3;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p1,p2,p3,p4,p5	ALL	NULL	NULL	NULL	NULL	5	Using where

select * from t1 where f1 is null;

f1

NULL

explain partitions select * from t1 where f1 is null;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	p2	system	NULL	NULL	NULL	NULL	1	

drop table t1;

create table t1 (a int) partition by LIST(a) (

partition pn values in (NULL),

partition p0 values in (0),

partition p1 values in (1),

partition p2 values in (2)

);

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

select * from t1 where a is null or a < 2;

a

NULL

0

1

explain partitions select * from t1 where a is null or a < 2;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	pn,p0,p1	ALL	NULL	NULL	NULL	NULL	3	Using where

select * from t1 where a is null or a < 0 or a > 1;

a

NULL

2

explain partitions select * from t1 where a is null or a < 0 or a > 1;

id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	pn,p2	ALL	NULL	NULL	NULL	NULL	2	Using where

drop table t1;

End of 5.1 tests