Commit 98211bea authored by unknown's avatar unknown
Browse files

Merge 


sql/CMakeLists.txt:
  Auto merged
sql/events.cc:
  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_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/sql_show.cc:
  SCCS merged
parents 57f3f256 400276c2

.bzrignore

+5 −0
Original line number Diff line number Diff line
@@ -1778,3 +1778,8 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

libmysql/viosocket.o.6WmSJk

libmysqld/event_data_objects.cc

libmysqld/event_db_repository.cc

libmysqld/event_queue.cc

server-tools/instance-manager/net_serv.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

+14 −2
Original line number Diff line number Diff line
@@ -85,13 +85,25 @@ 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);
@@ -358,7 +370,7 @@ 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

+1 −12
Original line number Diff line number Diff line
@@ -17,18 +17,7 @@ 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;

mysql-test/t/events.test

+13 −4
Original line number Diff line number Diff line
@@ -81,14 +81,23 @@ SHOW EVENTS; 
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;

--sleep 2

--error 1562

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

--sleep 2

delimiter |;

alter event e_43 do

begin

  alter event e_43 on schedule every 5 minute;

  insert into test_nested values(1);

end|

delimiter ;|

set global event_scheduler = 1;

--sleep 1

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

drop event e_43;

--sleep 1

drop table test_nested;



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

create table non_qualif(a int);
@@ -315,7 +324,7 @@ drop event закачка21; 
# Bug #16410  Events: CREATE EVENT is legal in a CREATE TRIGGER statement

#

create table t_16 (s1 int);

--error 1422

--error 1562

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;

drop table t_16;

#