Commit 797b2b11 authored by thek@adventure.(none)'s avatar thek@adventure.(none)
Browse files

Merge adventure.(none):/home/thek/Development/cpp/bug35997/my51-bug35997 

into  adventure.(none):/home/thek/Development/cpp/mysql-5.1-bugteam
parents 62655189 19a22f87

libmysqld/Makefile.am

+1 −3
Original line number Diff line number Diff line
@@ -73,12 +73,10 @@ 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_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 \

	sql_servers.cc

	sql_servers.cc event_parse_data.cc



libmysqld_int_a_SOURCES= $(libmysqld_sources)

nodist_libmysqld_int_a_SOURCES= $(libmysqlsources) $(sqlsources)

mysql-test/r/events_embedded.result

0 → 100644
+2 −0
Original line number Diff line number Diff line 
set global event_scheduler=ON;

ERROR HY000: Unknown system variable 'event_scheduler'

mysql-test/r/is_embedded.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
have_embedded

1

mysql-test/t/events_embedded.test

0 → 100644
+5 −0
Original line number Diff line number Diff line 
--source include/is_embedded.inc



--error 1193

set global event_scheduler=ON;

mysql-test/t/events_trans.test

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 
# Tests that require transactions

#

-- source include/have_innodb.inc

-- source include/not_embedded.inc



--disable_warnings

drop database if exists events_test;

drop database if exists mysqltest_no_such_database;