bk commit into 5.1 tree (andrey:1.2226)

[ahristov]

Below is the list of changes that have just been committed into a local
5.1 repository of andrey. When andrey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2226 06/03/24 17:58:27 andrey@lmy004. +4 -0
  manual merge

  mysql-test/r/events_bugs.result
    1.6 06/03/24 17:58:19 andrey@lmy004. +3 -3
    manual merge

  scripts/mysql_fix_privilege_tables.sql
    1.44 06/03/24 17:48:43 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/t/events_bugs.test
    1.5 06/03/24 17:48:43 andrey@lmy004. +0 -0
    Auto merged

  mysql-test/r/events.result
    1.29 06/03/24 17:48:43 andrey@lmy004. +0 -3
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	andrey
# Host:	lmy004.
# Root:	/work/mysql-5.1-bug16415/RESYNC

--- 1.28/mysql-test/r/events.result	2006-03-17 11:01:35 +01:00
+++ 1.29/mysql-test/r/events.result	2006-03-24 17:48:43 +01:00
@@ -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,

--- 1.5/mysql-test/r/events_bugs.result	2006-03-17 11:01:35 +01:00
+++ 1.6/mysql-test/r/events_bugs.result	2006-03-24 17:58:19 +01:00
@@ -1,5 +1,20 @@
 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();

--- 1.4/mysql-test/t/events_bugs.test	2006-03-17 11:01:35 +01:00
+++ 1.5/mysql-test/t/events_bugs.test	2006-03-24 17:48:43 +01:00
@@ -1,5 +1,28 @@
 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

--- 1.43/scripts/mysql_fix_privilege_tables.sql	2006-03-03 09:51:26 +01:00
+++ 1.44/scripts/mysql_fix_privilege_tables.sql	2006-03-24 17:48:43 +01:00
@@ -671,6 +671,7 @@ ALTER TABLE event ADD sql_mode
                             ) DEFAULT '' NOT NULL AFTER on_completion;
 
 UPDATE user SET Event_priv=Super_priv WHERE @hadEventPriv = 0;
+ALTER TABLE event MODIFY name char(64) CHARACTER SET utf8 NOT NULL default '';
 
 --
 -- TRIGGER privilege