bk commit into 5.1 tree (andrey:1.2166) BUG#16415

[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.2166 06/03/24 17:45:52 andrey@lmy004. +6 -0
  fix for bug#16415 Events names are case sensitive

  scripts/mysql_fix_privilege_tables.sql
    1.43 06/03/24 17:45:44 andrey@lmy004. +1 -0
    make name not binary, then event names won't be case sensitive

  scripts/mysql_create_system_tables.sh
    1.39 06/03/24 17:45:44 andrey@lmy004. +1 -1
    make name not binary, then event names won't be case sensitive

  mysql-test/t/events_bugs.test
    1.2 06/03/24 17:45:44 andrey@lmy004. +24 -1
    test case for bug #16415 events' names are case sensitive

  mysql-test/r/events_bugs.result
    1.3 06/03/24 17:45:44 andrey@lmy004. +15 -0
    update result

  mysql-test/r/events.result
    1.27 06/03/24 17:45:44 andrey@lmy004. +4 -2
    output fix

  mysql-test/lib/init_db.sql
    1.26 06/03/24 17:45:44 andrey@lmy004. +1 -1
    make name not binary, then event names won't be case sensitive

# 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

--- 1.26/mysql-test/r/events.result	2006-03-06 11:35:32 +01:00
+++ 1.27/mysql-test/r/events.result	2006-03-24 17:45:44 +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,
@@ -260,8 +260,10 @@ ALTER TABLE mysql.event MODIFY db char(6
 "This should work"
 SHOW EVENTS;
 Db	Name	Definer	Type	Execute at	Interval value	Interval field	Starts	Ends	Status
-events_test	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED
+events_test                                                
	intact_check	root@localhost	RECURRING	NULL	10	HOUR	#	#	ENABLED
 ALTER TABLE mysql.event MODIFY db char(64) character set cp1251 default '';
+Warnings:
+Warning	1265	Data truncated for column 'db' at row 1
 SELECT event_name FROM INFORMATION_SCHEMA.EVENTS;
 ERROR HY000: Cannot load from mysql.event. Table probably corrupted. See error log.
 ALTER TABLE mysql.event MODIFY db varchar(64) character set utf8 collate utf8_bin default
'';

--- 1.2/mysql-test/r/events_bugs.result	2006-02-21 02:40:15 +01:00
+++ 1.3/mysql-test/r/events_bugs.result	2006-03-24 17:45:44 +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 global event_scheduler=0;
 "Wait a bit to settle down"
 delete from mysql.event;

--- 1.1/mysql-test/t/events_bugs.test	2006-02-20 23:52:12 +01:00
+++ 1.2/mysql-test/t/events_bugs.test	2006-03-24 17:45:44 +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 - 16407: Events: Changes in sql_mode won't be taken into account
 #
@@ -41,7 +64,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.25/mysql-test/lib/init_db.sql	2006-03-01 13:31:12 +01:00
+++ 1.26/mysql-test/lib/init_db.sql	2006-03-24 17:45:44 +01:00
@@ -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,

--- 1.42/scripts/mysql_fix_privilege_tables.sql	2006-02-28 22:46:22 +01:00
+++ 1.43/scripts/mysql_fix_privilege_tables.sql	2006-03-24 17:45:44 +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

--- 1.38/scripts/mysql_create_system_tables.sh	2006-03-01 13:31:13 +01:00
+++ 1.39/scripts/mysql_create_system_tables.sh	2006-03-24 17:45:44 +01:00
@@ -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,"