Commit 57f3f256 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/opt/local/work/mysql-5.1-runtime


mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/events_stress.test:
  Auto merged
parents 91efca68 313b46a0

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -462,6 +462,7 @@ libmysqld/event.cc 
libmysqld/event_executor.cc

libmysqld/event_scheduler.cc

libmysqld/event_timed.cc

libmysqld/events.cc

libmysqld/examples/client_test.c

libmysqld/examples/client_test.cc

libmysqld/examples/completion_hash.cc

include/my_time.h

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ enum interval_type 
  INTERVAL_YEAR_MONTH, INTERVAL_DAY_HOUR, INTERVAL_DAY_MINUTE,

  INTERVAL_DAY_SECOND, INTERVAL_HOUR_MINUTE, INTERVAL_HOUR_SECOND,

  INTERVAL_MINUTE_SECOND, INTERVAL_DAY_MICROSECOND, INTERVAL_HOUR_MICROSECOND,

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND

  INTERVAL_MINUTE_MICROSECOND, INTERVAL_SECOND_MICROSECOND, INTERVAL_LAST

};



C_MODE_END

libmysqld/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc 
            ../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c

            ../sql-common/my_time.c ../sql-common/my_user.c

            ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc

            ../sql/event_timed.cc ../sql/event.cc ../sql/discover.cc

            ../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc

            ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc

            ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc

            ../sql/ha_myisammrg.cc ${mysql_se_ha_src}

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ 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 event.cc event_timed.cc \

	event_scheduler.cc events.cc event_timed.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

+6 −6
Original line number Diff line number Diff line
@@ -365,19 +365,19 @@ on schedule every 10 hour 
disable

do

select 1;

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_body

select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_definition

events_test	white_space	root@localhost	select 1

drop event white_space;

create event white_space on schedule every 10 hour disable do

select 2;

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_body

select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_definition

events_test	white_space	root@localhost	select 2

drop event white_space;

create event white_space on schedule every 10 hour disable do	select 3;

select event_schema, event_name, definer, event_body from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_body

select event_schema, event_name, definer, event_definition from information_schema.events where event_name='white_space';

event_schema	event_name	definer	event_definition

events_test	white_space	root@localhost	select 3

drop event white_space;

create event e1 on schedule every 1 year do set @a = 5;