Commit b95fb173 authored by unknown's avatar unknown
Browse files

manual merge 


mysql-test/r/events.result:
  Auto merged
mysql-test/t/events_bugs.test:
  Auto merged
scripts/mysql_fix_privilege_tables.sql:
  Auto merged
parents 1a53c9c3 6e9cd55d

mysql-test/lib/init_db.sql

+1 −1
Original line number Diff line number Diff line
@@ -579,7 +579,7 @@ DROP PROCEDURE create_log_tables; 


CREATE TABLE event (

  db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  name char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  name char(64) CHARACTER SET utf8 NOT NULL default '',

  body longblob NOT NULL,

  definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',

  execute_at DATETIME default NULL,

mysql-test/r/events.result

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ SHOW CREATE TABLE mysql.event; 
Table	Create Table

event	CREATE TABLE `event` (

  `db` char(20) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  `name` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  `name` char(64) NOT NULL DEFAULT '',

  `body` longblob NOT NULL,

  `definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',

  `execute_at` datetime DEFAULT NULL,

mysql-test/r/events_bugs.result

+15 −0
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;

CREATE EVENT lower_case ON SCHEDULE EVERY 1 MINUTE DO SELECT 1;

CREATE EVENT Lower_case ON SCHEDULE EVERY 2 MINUTE DO SELECT 2;

ERROR HY000: Event 'Lower_case' already exists

DROP EVENT Lower_case;

SET NAMES cp1251;

CREATE EVENT äîëåí_ðåãèñòúð_1251 ON SCHEDULE EVERY 1 YEAR DO SELECT 100;

CREATE EVENT ÄîËåÍ_ðåãèñòúð_1251 ON SCHEDULE EVERY 2 YEAR DO SELECT 200;

ERROR HY000: Event 'ДоЛеН_регистър_1251' already exists

DROP EVENT ÄîËåÍ_ðåãèñòúð_1251;

SET NAMES utf8;

CREATE EVENT долен_регистър_утф8 ON SCHEDULE EVERY 3 YEAR DO SELECT 300;

CREATE EVENT ДОЛЕН_регистър_утф8 ON SCHEDULE EVERY 4 YEAR DO SELECT 400;

ERROR HY000: Event 'ДОЛЕН_регистър_утф8' already exists

DROP EVENT ДОЛЕН_регистър_утф8;

SET NAMES latin1;

set @a=3;

CREATE PROCEDURE p_16 () CREATE EVENT e_16 ON SCHEDULE EVERY @a SECOND DO SET @a=5;

call p_16();

mysql-test/t/events_bugs.test

+24 −1
Original line number Diff line number Diff line 
create database if not exists events_test;

use events_test;



#

# START - 16415: Events: event names are case sensitive

#

CREATE EVENT lower_case ON SCHEDULE EVERY 1 MINUTE DO SELECT 1;

--error ER_EVENT_ALREADY_EXISTS

CREATE EVENT Lower_case ON SCHEDULE EVERY 2 MINUTE DO SELECT 2;

DROP EVENT Lower_case;

SET NAMES cp1251;

CREATE EVENT __1251 ON SCHEDULE EVERY 1 YEAR DO SELECT 100;

--error ER_EVENT_ALREADY_EXISTS

CREATE EVENT __1251 ON SCHEDULE EVERY 2 YEAR DO SELECT 200;

DROP EVENT __1251;

SET NAMES utf8;

CREATE EVENT долен_регистър_утф8 ON SCHEDULE EVERY 3 YEAR DO SELECT 300;

--error ER_EVENT_ALREADY_EXISTS

CREATE EVENT ДОЛЕН_регистър_утф8 ON SCHEDULE EVERY 4 YEAR DO SELECT 400;

DROP EVENT ДОЛЕН_регистър_утф8;

SET NAMES latin1;

#

# END   - 16415: Events: event names are case sensitive

#



#

# START - BUG#16408: Events: crash for an event in a procedure

#
@@ -75,7 +98,7 @@ begin 
  select get_lock('ee_16407_2', 60);

  insert into events_test.events_smode_test values('ee_16407_2','1980-19-02');

end|

--error 1292

--error ER_TRUNCATED_WRONG_VALUE

insert into events_smode_test values ('test','1980-19-02')|

--echo "This is ok"

create event ee_16407_3 on schedule every 60 second do

scripts/mysql_create_system_tables.sh

+1 −1
Original line number Diff line number Diff line
@@ -775,7 +775,7 @@ if test ! -f $mdata/event.frm 
then

  c_ev="$c_ev CREATE TABLE event ("

  c_ev="$c_ev   db char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"

  c_ev="$c_ev   name char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"

  c_ev="$c_ev   name char(64) CHARACTER SET utf8 NOT NULL default '',"

  c_ev="$c_ev   body longblob NOT NULL,"

  c_ev="$c_ev   definer char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL default '',"

  c_ev="$c_ev   execute_at DATETIME default NULL,"