Commit b84008c9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/mnt/raid/alik/MySQL/devel/5.1-tree 

into  mysql.com:/mnt/raid/alik/MySQL/devel/5.1-rt-bug20294


mysql-test/t/disabled.def:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents d9ec7f3c 00508f8f

.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_logs_tests.result

+10 −3
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ SHOW VARIABLES LIKE 'log_slow_queries'; 
Variable_name	Value

log_slow_queries	ON

DROP FUNCTION get_value;

"Make it quite long"

SET SESSION long_query_time=300;

TRUNCATE mysql.slow_log;

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

user_host	query_time	db	sql_text
@@ -44,7 +46,10 @@ SLEEP(2) 
SELECT user_host, query_time, db, sql_text FROM mysql.slow_log;

user_host	query_time	db	sql_text

USER_HOST	SLEEPVAL	events_test	SELECT SLEEP(2)

SET SESSION long_query_time=300;

"Make it quite long"

TRUNCATE mysql.slow_log;

SET SESSION long_query_time=1;

CREATE TABLE slow_event_test (slo_val tinyint, val tinyint);

"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);
@@ -63,9 +68,9 @@ slo_val val 
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"

DROP EVENT long_event;

SET SESSION long_query_time=10;

SET GLOBAL long_query_time=1;

DROP EVENT long_event;

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

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

"Check our table. Should see 2 rows"
@@ -78,8 +83,10 @@ SELECT user_host, query_time, db, sql_text FROM mysql.slow_log; 
user_host	query_time	db	sql_text

USER_HOST	SLEEPVAL	events_test	INSERT INTO slow_event_test SELECT @@long_query_time, SLEEP(2)

DROP EVENT long_event2;

SET GLOBAL  long_query_time =@old_global_long_query_time;

SET SESSION long_query_time =@old_session_long_query_time;

"Make it quite long"

SET SESSION long_query_time=300;

TRUNCATE mysql.slow_log;

DROP TABLE slow_event_test;

SET GLOBAL  long_query_time =@old_global_long_query_time;

SET SESSION long_query_time =@old_session_long_query_time;

drop database events_test;