Commit 5d91dc25 authored by unknown's avatar unknown
Browse files

Manual merge 


BitKeeper/etc/ignore:
  auto-union
mysql-test/r/events_logs_tests.result:
  Auto merged
mysql-test/t/events_logs_tests.test:
  Auto merged
mysql-test/t/events_stress.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/event_data_objects.cc:
  manual merge
sql/events.cc:
  manual merge
parents e8699b56 974eecc2

.bzrignore

+4 −0
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ libmysql/mysys_priv.h 
libmysql/net.c

libmysql/release/libmysql.exp

libmysql/vio_priv.h

libmysql/viosocket.o.6WmSJk

libmysql_r/*.c

libmysql_r/acconfig.h

libmysql_r/conf_to_src
@@ -461,7 +462,10 @@ libmysqld/discover.cc 
libmysqld/emb_qcache.cpp

libmysqld/errmsg.c

libmysqld/event.cc

libmysqld/event_data_objects.cc

libmysqld/event_db_repository.cc

libmysqld/event_executor.cc

libmysqld/event_queue.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/events.cc

libmysqld/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -68,7 +68,8 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
	spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \

	sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \

	parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \

	event_scheduler.cc events.cc event_timed.cc \

	event_scheduler.cc events.cc event_data_objects.cc \

        event_queue.cc event_db_repository.cc \

	rpl_filter.cc sql_partition.cc sql_builtin.cc sql_plugin.cc \

	sql_tablespace.cc \

	rpl_injector.cc my_user.c partition_info.cc

mysql-test/r/events.result

+22 −9
Original line number Diff line number Diff line
@@ -85,13 +85,24 @@ SHOW EVENTS; 
Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status

events_test	event_starts_test	root@localhost	RECURRING	NULL	20	SECOND	#	#	ENABLED

DROP EVENT event_starts_test;

create table test_nested(a int);

create event e_43 on schedule every 1 second do set @a = 5;

set global event_scheduler = 1;

alter event e_43 do alter event e_43 do set @a = 4;

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

alter event e_43 do

begin

alter event e_43 on schedule every 5 minute;

insert into test_nested values(1);

end|

set global event_scheduler = 1;

select db, name, body, status, interval_field, interval_value from mysql.event;

db	name	body	status	interval_field	interval_value

events_test	e_43	set @a = 4	ENABLED	SECOND	1

events_test	e_43	begin

alter event e_43 on schedule every 5 minute;

insert into test_nested values(1);

end	ENABLED	MINUTE	5

drop event e_43;

drop table test_nested;

"Let's check whether we can use non-qualified names"

create table non_qualif(a int);

create event non_qualif_ev on schedule every 10 minute do insert into non_qualif values (800219);
@@ -195,6 +206,10 @@ ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND' 
SHOW EVENTS;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

drop event root22;

create event root23 on schedule every -100 year do select 1;

ERROR HY000: INTERVAL is either not positive or too big

create event root23 on schedule every 222222222222222222222 year do select 1;

ERROR HY000: INTERVAL is either not positive or too big

drop event root6;

drop event root7;

drop event root8;
@@ -285,9 +300,9 @@ select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_comp 
db	name	body	definer	convert_tz(execute_at, 'UTC', 'SYSTEM')	on_completion

events_test	e_26	set @a = 5	root@localhost	2017-01-01 00:00:00	DROP

drop event e_26;

create event e_26 on schedule at NULL disabled do set @a = 5;

create event e_26 on schedule at NULL disable do set @a = 5;

ERROR HY000: Incorrect AT value: 'NULL'

create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5;

create event e_26 on schedule at 'definitely not a datetime' disable do set @a = 5;

ERROR HY000: Incorrect AT value: 'definitely not a datetime'

set names utf8;

create event задачка on schedule every 123 minute starts now() ends now() + interval 1 month do select 1;
@@ -311,7 +326,6 @@ root@localhost закачка events_test 
"Should be only 1 process"

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	Suspended	NULL

select release_lock("test_lock1");

release_lock("test_lock1")

1
@@ -331,7 +345,7 @@ create event закачка on schedule every 10 hour do select get_lock("test_l 
"Should have only 2 processes: the scheduler and the locked event"

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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

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

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

"Release the mutex, the event worker should finish."
@@ -347,18 +361,17 @@ create event закачка21 on schedule every 10 hour do select get_lock("test 
"Should have only 3 processes: the scheduler, our conn and the locked event"

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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

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

set global event_scheduler=2;

"Should have only our process now:"

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	Suspended	NULL

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

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;

ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

drop table t_16;

create event white_space

on schedule every 10 hour

mysql-test/r/events_bugs.result

+41 −28
Original line number Diff line number Diff line
@@ -17,26 +17,26 @@ DROP EVENT ДОЛЕН_регистър_утф8; 
SET NAMES latin1;

set @a=3;

CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;

call p_16();

"Here we used to crash!"

call p_16();

ERROR HY000: Event 'e_16' already exists

call p_16();

ERROR HY000: Event 'e_16' already exists

DROP EVENT e_16;

CALL p_16();

CALL p_16();

ERROR HY000: Event 'e_16' already exists

DROP PROCEDURE p_16;

DROP EVENT e_16;

ERROR HY000: Recursivity of EVENT DDL statements is forbidden when body is present

create event e_55 on schedule at 99990101000000 do drop table t;

ERROR HY000: Incorrect AT value: '99990101000000'

create event e_55 on schedule every 10 hour starts 99990101000000 do drop table t;

ERROR HY000: Incorrect STARTS value: '99990101000000'

create event e_55 on schedule every 10 minute ends 99990101000000 do drop table t;

ERROR HY000: ENDS is either invalid or before STARTS

create event e_55 on schedule at 10000101000000 do drop table t;

ERROR HY000: Activation (AT) time is in the past

create event e_55 on schedule at 20000101000000 do drop table t;

ERROR HY000: Activation (AT) time is in the past

create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;

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 'starts 10000101000000 do drop table t' at line 1

create event e_55 on schedule at 20200101000000 ends 10000101000000 do drop table t;

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 'ends 10000101000000 do drop table t' at line 1

create event e_55 on schedule at 20200101000000 starts 10000101000000 ends 10000101000000 do drop table t;

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 'starts 10000101000000 ends 10000101000000 do drop table t' at line 1

create event e_55 on schedule every 10 hour starts 10000101000000 do drop table t;

ERROR HY000: Incorrect STARTS value: '10000101000000'

set global event_scheduler=2;

"Wait a bit to settle down"

delete from mysql.event;

set global event_scheduler= 1;

set @old_sql_mode:=@@sql_mode;
@@ -52,7 +52,7 @@ end| 
"Now if everything is fine the event has compiled and is locked

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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

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

select release_lock('test_bug16407');

release_lock('test_bug16407')
@@ -68,6 +68,11 @@ select event_schema, event_name, sql_mode from information_schema.events order b 
event_schema	event_name	sql_mode

events_test	e_16407	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

drop event e_16407;

set sql_mode="ansi";

select get_lock('ee_16407_2', 60);

get_lock('ee_16407_2', 60)

1

set global event_scheduler= 1;

"Another sql_mode test"

set sql_mode="traditional";

create table events_smode_test(ev_name char(10), a date) engine=myisam;
@@ -75,6 +80,7 @@ create table events_smode_test(ev_name char(10), a date) engine=myisam; 
create event ee_16407_2 on schedule every 60 second do

begin

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

select release_lock('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,6 +89,7 @@ ERROR 22007: Incorrect date value: '1980-19-02' for column 'a' at row 1 
create event ee_16407_3 on schedule every 60 second do

begin

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

select release_lock('ee_16407_2');

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,6 +98,7 @@ set sql_mode=""| 
create event ee_16407_4 on schedule every 60 second do

begin

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

select release_lock('ee_16407_2');

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;
@@ -98,14 +106,9 @@ event_schema event_name sql_mode 
events_test	ee_16407_2	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

events_test	ee_16407_3	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER

events_test	ee_16407_4	

set sql_mode="ansi";

select get_lock('ee_16407_2', 60);

get_lock('ee_16407_2', 60)

1

set global event_scheduler= 1;

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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	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*/
@@ -114,7 +117,7 @@ release_lock('ee_16407_2') 
1

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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

set global event_scheduler= 2;

select * from events_smode_test order by ev_name, a;

ev_name	a
@@ -132,28 +135,30 @@ drop event ee_16407_3; 
drop event ee_16407_4;

"And now one last test regarding sql_mode and call of SP from an event"

delete from events_smode_test;

set sql_mode='ansi';

select get_lock('ee_16407_5', 60);

get_lock('ee_16407_5', 60)

1

set global event_scheduler= 1;

set sql_mode='traditional';

create procedure ee_16407_5_pendant() begin insert into events_test.events_smode_test values('ee_16407_5','2001-02-29'); end|

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) /*ee_16407_5*/;

select release_lock('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) /*ee_16407_6*/;

select release_lock('ee_16407_5');

call events_test.ee_16407_6_pendant();

end|

set sql_mode='ansi';

select get_lock('ee_16407_5', 60);

get_lock('ee_16407_5', 60)

1

set global event_scheduler= 1;

"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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	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');
@@ -162,7 +167,7 @@ release_lock('ee_16407_5') 
"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

event_scheduler	localhost	NULL	Daemon	Waiting for next activation	NULL

select * from events_smode_test order by ev_name, a;

ev_name	a

ee_16407_6	2004-02-29
@@ -201,4 +206,12 @@ events_test mysqltest_user1 mysqltest_user1@localhost RECURRING ENABLED 
drop event events_test.mysqltest_user1;

drop user mysqltest_user1@localhost;

drop database mysqltest_db1;

create event e_53 on schedule at (select s1 from ttx) do drop table t;

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 s1 from ttx) do drop table t' at line 1

create event e_53 on schedule every (select s1 from ttx) second do drop table t;

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 s1 from ttx) second do drop table t' at line 1

create event e_53 on schedule every 5 second starts (select s1 from ttx) do drop table t;

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 s1 from ttx) do drop table t' at line 1

create event e_53 on schedule every 5 second ends (select s1 from ttx) do drop table t;

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 s1 from ttx) do drop table t' at line 1

drop database events_test;

mysql-test/r/events_logs_tests.result

+5 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ SELECT user_host, argument FROM mysql.general_log WHERE argument LIKE '%alabala% 
END|

"Check General Query Log"

SET GLOBAL event_scheduler=2;

create event log_general on schedule every 1 minute do SELect 'alabala', sleep(3) from dual;

create event log_general on schedule every 1 minute do SELect 'alabala', sleep(1) from dual;

TRUNCATE mysql.general_log;

"1 row, the current statement!"

call select_general_log();
@@ -19,7 +19,7 @@ SET GLOBAL event_scheduler=1; 
"Should see 3 rows - the 'SELect' is in the middle. The other two are selects from general_log"

call select_general_log();

user_host	argument

USER_HOST	SELect 'alabala', sleep(3) from dual

USER_HOST	SELect 'alabala', sleep(1) from dual

DROP PROCEDURE select_general_log;

DROP EVENT log_general;

SET GLOBAL event_scheduler=2;
@@ -52,10 +52,11 @@ TRUNCATE mysql.slow_log; 
CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

SET SESSION long_query_time=1;

"This won't go to the slow log"

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(3);

SELECT * FROM slow_event_test;

slo_val	val

SET SESSION long_query_time=1;

SET GLOBAL event_scheduler=1;

CREATE EVENT long_event ON SCHEDULE EVERY 1 MINUTE DO INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(1.5);

"Sleep some more time than the actual event run will take"

SHOW VARIABLES LIKE 'event_scheduler';

Variable_name	Value
@@ -64,7 +65,7 @@ event_scheduler 1 
SELECT * FROM slow_event_test;

slo_val	val

4	0

"Check slow log. Should not see anything because 3 is under the threshold of 4 for GLOBAL, though over SESSION which is 2"

"Check slow log. Should not see anything because 1.5 is under the threshold of 300 for GLOBAL, though over SESSION which is 2"

SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

"This should go to the slow log"