Commit e69e640f authored by unknown's avatar unknown
Browse files

WL#3337 (Events new architecture) 

Small updates before patch submit.


client/mysqltest.c:
  allow --valgrind option to mysqltest so one can be able to detect
  whether the test is running under valgrind by having $VALGRIND_TEST,
  similar to BIG_TEST, in the test file.
mysql-test/mysql-test-run.pl:
  If the test suite is running under valgrind start mysqltest with --valgrind
  to inform that we run valgrind. mysqltest will provide $VALGRIND_TEST for the
  test cases.
mysql-test/r/events_bugs.result:
  update result
mysql-test/r/events_scheduling.result:
  update result
mysql-test/t/events.test:
  Increase times or the test will fail under valgrind
mysql-test/t/events_bugs.test:
  Increase times or the test will fail under valgrind
mysql-test/t/events_scheduling.test:
  Remove faulty test
  Disable the test case for valgrind
sql/event_data_objects.cc:
  count the number of executions
sql/event_data_objects.h:
  flags is not used at all
  add execution_count to count the number of executions
sql/event_db_repository.cc:
  Initialize wherever needed.
  Add a comment regarding valgrind warning.
sql/event_queue.cc:
  more debug info in the trace log
sql/event_scheduler.cc:
  Use macro COND_STATE_WAIT() in all cases we need waiting
  on condition. Hence, we can trace locking, attemption to lock
  and more with SHOW SCHEDULER STATUS
sql/event_scheduler.h:
  Change the declaration of cond_wait to accept THD
sql/events.cc:
  fix memory leak. Destroy event_queue
mysql-test/include/not_valgrind.inc:
  New BitKeeper file ``mysql-test/include/not_valgrind.inc''
mysql-test/r/not_valgrind.require:
  New BitKeeper file ``mysql-test/r/not_valgrind.require''
parent d65ab09c

client/mysqltest.c

+6 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ static my_bool ps_protocol= 0, ps_protocol_enabled= 0; 
static my_bool sp_protocol= 0, sp_protocol_enabled= 0;

static my_bool view_protocol= 0, view_protocol_enabled= 0;

static my_bool cursor_protocol= 0, cursor_protocol_enabled= 0;

static my_bool opt_valgrind_test= 0;

static int parsing_disabled= 0;

const char *manager_user="root",*manager_host=0;

char *manager_pass=0;
@@ -3343,6 +3344,8 @@ static struct my_option my_long_options[] = 
   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"user", 'u', "User for login.", (gptr*) &user, (gptr*) &user, 0, GET_STR,

   REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"valgrind", 'N', "Define VALGRIND_TEST to 1.", (gptr*) &opt_valgrind_test,

   (gptr*) &opt_valgrind_test, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"verbose", 'v', "Write more.", (gptr*) &verbose, (gptr*) &verbose, 0,

   GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},

  {"version", 'V', "Output version information and exit.",
@@ -5108,6 +5111,9 @@ static void init_var_hash(MYSQL *mysql) 
    die("Variable hash initialization failed");

  my_hash_insert(&var_hash, (byte*) var_init(0,"BIG_TEST", 0,

                                             (opt_big_test) ? "1" : "0", 0));

  my_hash_insert(&var_hash, (byte*) var_init(0,"VALGRIND_TEST", 0,

                                             (opt_valgrind_test) ? "1" : "0",

                                             0));

  v= var_init(0,"MAX_TABLES", 0, (sizeof(ulong) == 4) ? "31" : "62",0);

  my_hash_insert(&var_hash, (byte*) v);

  v= var_init(0,"SERVER_VERSION", 0, mysql_get_server_info(mysql), 0);

mysql-test/include/not_valgrind.inc

0 → 100644
+4 −0
Original line number Diff line number Diff line 
--require r/not_valgrind.require

--disable_query_log

eval select $VALGRIND_TEST as using_valgrind;

--enable_query_log

mysql-test/mysql-test-run.pl

+5 −0
Original line number Diff line number Diff line
@@ -3461,6 +3461,11 @@ sub run_mysqltest ($) { 
    mtr_add_arg($args, "--big-test");

  }



  if ( $opt_valgrind )

  {

    mtr_add_arg($args, "--valgrind");

  }



  if ( $opt_compress )

  {

    mtr_add_arg($args, "--compress");

mysql-test/r/events_bugs.result

+21 −21
Original line number Diff line number Diff line
@@ -50,10 +50,10 @@ select get_lock('test_bug16407', 60); 
drop table "hashed_num";

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	Daemon	Waiting for next activation	NULL

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

select /*1*/ user, host, db, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	info

event_scheduler	localhost	NULL	NULL

root	localhost	events_test	select get_lock('test_bug16407', 60)

select release_lock('test_bug16407');

release_lock('test_bug16407')

1
@@ -106,18 +106,18 @@ 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	

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	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*/

select /*2*/ user, host, db, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	info

event_scheduler	localhost	NULL	NULL

root	localhost	events_test	select get_lock('ee_16407_2', 60) /*ee_16407_2*/

root	localhost	events_test	select get_lock('ee_16407_2', 60) /*ee_16407_3*/

root	localhost	events_test	select get_lock('ee_16407_2', 60) /*ee_16407_4*/

select release_lock('ee_16407_2');

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	Daemon	Waiting for next activation	NULL

select /*3*/ user, host, db, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	info

event_scheduler	localhost	NULL	NULL

set global event_scheduler= 2;

select * from events_smode_test order by ev_name, a;

ev_name	a
@@ -156,18 +156,18 @@ select release_lock('ee_16407_5'); 
call events_test.ee_16407_6_pendant();

end|

"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	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 /*4*/ user, host, db, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	info

event_scheduler	localhost	NULL	NULL

root	localhost	events_test	select get_lock('ee_16407_5', 60) /*ee_16407_5*/

root	localhost	events_test	select get_lock('ee_16407_5', 60) /*ee_16407_6*/

select release_lock('ee_16407_5');

release_lock('ee_16407_5')

1

"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	Daemon	Waiting for next activation	NULL

select /*5*/ user, host, db, info from information_schema.processlist where info is null or info not like '%processlist%' order by info;

user	host	db	info

event_scheduler	localhost	NULL	NULL

select * from events_smode_test order by ev_name, a;

ev_name	a

ee_16407_6	2004-02-29

mysql-test/r/events_scheduling.result

+0 −6
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ CREATE TABLE table_3(a int); 
CREATE TABLE table_4(a int);

CREATE TABLE T19170(s1 TIMESTAMP);

SET GLOBAL event_scheduler=1;

CREATE EVENT E19170 ON SCHEDULE EVERY 2 SECOND DO INSERT INTO T19170 VALUES(CURRENT_TIMESTAMP);

CREATE EVENT two_sec ON SCHEDULE EVERY 2 SECOND DO INSERT INTO table_1 VALUES(1);

CREATE EVENT start_n_end

ON SCHEDULE EVERY 1 SECOND
@@ -41,15 +40,10 @@ ERROR HY000: Unknown event 'only_one_time' 
"Should be preserved"

SELECT EVENT_NAME, STATUS FROM INFORMATION_SCHEMA.EVENTS ORDER BY EVENT_NAME;

EVENT_NAME	STATUS

E19170	ENABLED

two_time	DISABLED

DROP EVENT two_time;

DROP TABLE table_1;

DROP TABLE table_2;

DROP TABLE table_3;

DROP TABLE table_4;

"Checking for multiple executions in one second, should not happen -> 0 as result"

SELECT COUNT(*) FROM (SELECT s1, COUNT(*) AS cnt FROM T19170 GROUP BY s1) AS tmp WHERE tmp.cnt > 1;

COUNT(*)

0

DROP DATABASE events_test;