Commit b1793d9c authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into lmy004.:/work/mysql-5.1-bug16411


sql/sql_show.cc:
  Auto merged
parents a1023b05 a7d13b9d

mysql-test/r/events_microsec.result

0 → 100644
+56 −0
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;

CREATE EVENT micro_test ON SCHEDULE EVERY 100 MICROSECOND DO SELECT 1;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

CREATE EVENT micro_test ON SCHEDULE EVERY 100 DAY_MICROSECOND DO SELECT 1;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

CREATE EVENT micro_test ON SCHEDULE EVERY 100 HOUR_MICROSECOND DO SELECT 1;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

CREATE EVENT micro_test ON SCHEDULE EVERY 100 MINUTE_MICROSECOND DO SELECT 1;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

CREATE EVENT micro_test ON SCHEDULE EVERY 100 SECOND_MICROSECOND DO SELECT 1;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

"Now create normal event and change it on SQL level"

CREATE EVENT micro_test2 ON SCHEDULE EVERY 1 MONTH DO SELECT 1;

UPDATE mysql.event SET interval_field='MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

SHOW CREATE EVENT micro_test2;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

SET GLOBAL event_scheduler=0;

"Should not be running:"

SHOW VARIABLES like 'event_scheduler';

Variable_name	Value

event_scheduler	OFF

UPDATE mysql.event SET interval_field='DAY_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

SHOW CREATE EVENT micro_test2;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

SET GLOBAL event_scheduler=0;

"Should not be running:"

SHOW VARIABLES like 'event_scheduler';

Variable_name	Value

event_scheduler	OFF

UPDATE mysql.event SET interval_field='SECOND_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

SHOW CREATE EVENT micro_test2;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

SET GLOBAL event_scheduler=0;

"Should not be running:"

SHOW VARIABLES like 'event_scheduler';

Variable_name	Value

event_scheduler	OFF

UPDATE mysql.event SET interval_field='HOUR_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

SHOW CREATE EVENT micro_test2;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

SET GLOBAL event_scheduler=0;

"Should not be running:"

SHOW VARIABLES like 'event_scheduler';

Variable_name	Value

event_scheduler	OFF

UPDATE mysql.event SET interval_field='MINUTE_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

SHOW CREATE EVENT micro_test2;

ERROR 42000: This version of MySQL doesn't yet support 'MICROSECOND'

SET GLOBAL event_scheduler=0;

"Should not be running:"

SHOW VARIABLES like 'event_scheduler';

Variable_name	Value

event_scheduler	OFF

DROP EVENT micro_test2;

drop database events_test;

mysql-test/t/events_microsec.test

0 → 100644
+54 −0
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;



--error 1235

CREATE EVENT micro_test ON SCHEDULE EVERY 100 MICROSECOND DO SELECT 1;

--error 1235

CREATE EVENT micro_test ON SCHEDULE EVERY 100 DAY_MICROSECOND DO SELECT 1;

--error 1235

CREATE EVENT micro_test ON SCHEDULE EVERY 100 HOUR_MICROSECOND DO SELECT 1;

--error 1235

CREATE EVENT micro_test ON SCHEDULE EVERY 100 MINUTE_MICROSECOND DO SELECT 1;

--error 1235

CREATE EVENT micro_test ON SCHEDULE EVERY 100 SECOND_MICROSECOND DO SELECT 1;



--echo "Now create normal event and change it on SQL level"

CREATE EVENT micro_test2 ON SCHEDULE EVERY 1 MONTH DO SELECT 1;

UPDATE mysql.event SET interval_field='MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

--error 1235

SHOW CREATE EVENT micro_test2;

SET GLOBAL event_scheduler=0;

--sleep 1

--echo "Should not be running:"

SHOW VARIABLES like 'event_scheduler';

UPDATE mysql.event SET interval_field='DAY_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

--error 1235

SHOW CREATE EVENT micro_test2;

SET GLOBAL event_scheduler=0;

--sleep 1

--echo "Should not be running:"

SHOW VARIABLES like 'event_scheduler';

UPDATE mysql.event SET interval_field='SECOND_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

--error 1235

SHOW CREATE EVENT micro_test2;

SET GLOBAL event_scheduler=0;

--sleep 1

--echo "Should not be running:"

SHOW VARIABLES like 'event_scheduler';

UPDATE mysql.event SET interval_field='HOUR_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

--error 1235

SHOW CREATE EVENT micro_test2;

SET GLOBAL event_scheduler=0;

--sleep 1

--echo "Should not be running:"

SHOW VARIABLES like 'event_scheduler';

UPDATE mysql.event SET interval_field='MINUTE_MICROSECOND' WHERE db=database() AND definer=user() AND name='micro_test2';

--error 1235

SHOW CREATE EVENT micro_test2;

SET GLOBAL event_scheduler=0;

--sleep 1

--echo "Should not be running:"

SHOW VARIABLES like 'event_scheduler';

DROP EVENT micro_test2;



drop database events_test;

sql/event.cc

+3 −2
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ event_reconstruct_interval_expression(String *buf, 
  case INTERVAL_HOUR_MICROSECOND:

  case INTERVAL_MINUTE_MICROSECOND:

  case INTERVAL_SECOND_MICROSECOND:

  case INTERVAL_MICROSECOND:

    my_error(ER_NOT_SUPPORTED_YET, MYF(0), "MICROSECOND");

    return 1;

    break;
@@ -494,7 +495,7 @@ evex_open_event_table(THD *thd, enum thr_lock_type lock_type, TABLE **table) 
  

  if (table_check_intact(tables.table, EVEX_FIELD_COUNT, event_table_fields,

                         &mysql_event_last_create_time,

                         ER_EVENT_CANNOT_LOAD_FROM_TABLE))

                         ER_CANNOT_LOAD_FROM_TABLE))

  {

    close_thread_tables(thd);

    DBUG_RETURN(2);
@@ -984,7 +985,7 @@ db_find_event(THD *thd, sp_name *name, LEX_STRING *definer, event_timed **ett, 
  */

  if ((ret= et->load_from_row(root, table)))

  {

    my_error(ER_EVENT_CANNOT_LOAD_FROM_TABLE, MYF(0));

    my_error(ER_CANNOT_LOAD_FROM_TABLE, MYF(0));

    goto done;

  }

sql/event.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#define EVEX_BODY_TOO_LONG      SP_BODY_TOO_LONG

#define EVEX_BAD_PARAMS        -21

#define EVEX_NOT_RUNNING       -22

#define EVEX_MICROSECOND_UNSUP -23



#define EVENT_EXEC_NO_MORE      (1L << 0)

#define EVENT_NOT_USED          (1L << 1)

sql/event_executor.cc

+14 −5
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ evex_check_system_tables() 
  else

  {

    table_check_intact(tables.table, MYSQL_DB_FIELD_COUNT, mysql_db_table_fields,

                     &mysql_db_table_last_check,ER_EVENT_CANNOT_LOAD_FROM_TABLE);                           

                       &mysql_db_table_last_check,ER_CANNOT_LOAD_FROM_TABLE);                           

    close_thread_tables(thd);

  }
@@ -723,6 +723,8 @@ event_executor_worker(void *event_void) 
      sql_print_information("SCHEDULER: COMPILE ERROR for event %s.%s of",

                            event->dbname.str, event->name.str,

                            event->definer.str);

    else if (ret == EVEX_MICROSECOND_UNSUP)

      sql_print_information("SCHEDULER: MICROSECOND is not supported");

  }

  event->spawn_thread_finish(thd);
@@ -775,7 +777,7 @@ event_executor_worker(void *event_void) 
     

   RETURNS

     0  - OK

    -1  - Error

    !0  - Error

    

   NOTES

     Reports the error to the console
@@ -828,11 +830,17 @@ evex_load_events_from_db(THD *thd) 
    DBUG_PRINT("evex_load_events_from_db",

            ("Event %s loaded from row. Time to compile", et->name.str));

    

    if ((ret= et->compile(thd, &evex_mem_root)))

    {

    switch (ret= et->compile(thd, &evex_mem_root)) {

    case EVEX_MICROSECOND_UNSUP:

      sql_print_error("SCHEDULER: mysql.event is tampered. MICROSECOND is not "

                      "supported but found in mysql.event");

      goto end;

    case EVEX_COMPILE_ERROR:

      sql_print_error("SCHEDULER: Error while compiling %s.%s. Aborting load.",

                      et->dbname.str, et->name.str);

      goto end;

    default:

      break;

    }

    

    // let's find when to be executed
@@ -860,6 +868,7 @@ evex_load_events_from_db(THD *thd) 
  thd->version--;  // Force close to free memory



  close_thread_tables(thd);

  if (!ret)

    sql_print_information("SCHEDULER: Loaded %d event%s", count, (count == 1)?"":"s");

  DBUG_PRINT("info", ("Status code %d. Loaded %d event(s)", ret, count));