MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kpettersson Date:May 13 2008 12:06pm
Subject:bk commit into 5.1 tree (thek:1.2626) BUG#35997
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of thek.  When thek 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@stripped, 2008-05-13 14:06:32+02:00, thek@adventure.(none) +6 -0
  Bug#35997 Event scheduler seems to let the server crash, if it is embedded.
  
  Fixed build failure depending on events in embedded build.

  mysql-test/r/create.result@stripped, 2008-05-13 14:06:28+02:00, thek@adventure.(none) +0 -10
    Moved test with events to another test file sine embedded build doesn't
    support event scheduler.

  mysql-test/r/events_2.result@stripped, 2008-05-13 14:06:28+02:00, thek@adventure.(none) +10 -0
    Moved test with events to another test file sine embedded build doesn't
    support event scheduler.

  mysql-test/r/sp.result@stripped, 2008-05-13 14:06:28+02:00, thek@adventure.(none) +2 -61
    Removed 'show privileges' from test as result is depending on 
    if event sheduler is built in. 

  mysql-test/t/create.test@stripped, 2008-05-13 14:06:28+02:00, thek@adventure.(none) +0 -11
    Moved test with events to another test file sine embedded build doesn't
    support event scheduler.

  mysql-test/t/events_2.test@stripped, 2008-05-13 14:06:28+02:00, thek@adventure.(none) +12 -0
    Moved test with events to another test file sine embedded build doesn't
    support event scheduler.

  mysql-test/t/sp.test@stripped, 2008-05-13 14:06:28+02:00, thek@adventure.(none) +2 -1
    Removed 'show privileges' from test as result is depending on 
    if event sheduler is built in. 

diff -Nrup a/mysql-test/r/create.result b/mysql-test/r/create.result
--- a/mysql-test/r/create.result	2008-03-22 09:32:23 +01:00
+++ b/mysql-test/r/create.result	2008-05-13 14:06:28 +02:00
@@ -1655,16 +1655,6 @@ Table	Create Table
 show create view имя_вью_кодировке_утф8_длиной_больше_чем_42;
 View	Create View	character_set_client	collation_connection
 имя_вью_кодировке_утф8_длиной_больше_чем_42	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `имя_вью_кодировке_утф8_длиной_больше_чем_42` AS select `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`.`имя_поля_в_кодировке_утф8_длиной_больше_чем_45` AS `имя_поля_в_кодировке_утф8_длиной_больше_чем_45` from `имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48`	utf8	utf8_general_ci
-create event имя_события_в_кодировке_утф8_длиной_больше_чем_48 on schedule every 2 year do select 1;
-select EVENT_NAME from information_schema.events
-where event_schema='test';
-EVENT_NAME
-имя_события_в_кодировке_утф8_длиной_больше_чем_48
-drop event имя_события_в_кодировке_утф8_длиной_больше_чем_48;
-create event
-очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_66
-on schedule every 2 year do select 1;
-ERROR 42000: Identifier name 'очень_очень_очень_очень_очень_очень_очень_очень_длинна' is too long
 create trigger имя_триггера_в_кодировке_утф8_длиной_больше_чем_49
 before insert on имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48 for each row set @a:=1;
 select TRIGGER_NAME from information_schema.triggers where
diff -Nrup a/mysql-test/r/events_2.result b/mysql-test/r/events_2.result
--- a/mysql-test/r/events_2.result	2008-02-20 14:40:43 +01:00
+++ b/mysql-test/r/events_2.result	2008-05-13 14:06:28 +02:00
@@ -318,4 +318,14 @@ insert into t1 (a) values (1)|
 ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
 drop table t1|
 drop event e1|
+set names utf8;
+create event имя_события_в_кодировке_утф8_длиной_больше_чем_48 on schedule every 2 year do select 1;
+select EVENT_NAME from information_schema.events
+where event_schema='test';
+EVENT_NAME
+drop event имя_события_в_кодировке_утф8_длиной_больше_чем_48;
+create event
+очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_66
+on schedule every 2 year do select 1;
+ERROR 42000: Identifier name 'очень_очень_очень_очень_очень_очень_очень_очень_длинна' is too long
 drop database events_test;
diff -Nrup a/mysql-test/r/sp.result b/mysql-test/r/sp.result
--- a/mysql-test/r/sp.result	2008-02-17 13:57:15 +01:00
+++ b/mysql-test/r/sp.result	2008-05-13 14:06:28 +02:00
@@ -2446,7 +2446,8 @@ show errors;
 show columns from t1;
 show keys from t1;
 show open tables like 'foo';
-show privileges;
+# Removed because result will differ in embedded mode.
+#show privileges;
 show status like 'foo';
 show tables like 'foo';
 show variables like 'foo';
@@ -2472,36 +2473,6 @@ id	char(16)	NO			
 data	int(11)	NO		NULL	
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 Database	Table	In_use	Name_locked
-Privilege	Context	Comment
-Alter	Tables	To alter the table
-Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
-Create	Databases,Tables,Indexes	To create new databases and tables
-Create routine	Functions,Procedures	To use CREATE FUNCTION/PROCEDURE
-Create temporary tables	Databases	To use CREATE TEMPORARY TABLE
-Create view	Tables	To create new views
-Create user	Server Admin	To create new users
-Delete	Tables	To delete existing rows
-Drop	Databases,Tables	To drop databases, tables, and views
-Event	Server Admin	To create, alter, drop and execute events
-Execute	Functions,Procedures	To execute stored routines
-File	File access on server	To read and write files on the server
-Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
-Index	Tables	To create or drop indexes
-Insert	Tables	To insert data into tables
-Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
-Process	Server Admin	To view the plain text of currently executing queries
-References	Databases,Tables	To have references on tables
-Reload	Server Admin	To reload or refresh tables, logs and privileges
-Replication client	Server Admin	To ask where the slave or master servers are
-Replication slave	Server Admin	To read binary log events from the master
-Select	Tables	To retrieve rows from table
-Show databases	Server Admin	To see all databases with SHOW DATABASES
-Show view	Tables	To see views with SHOW CREATE VIEW
-Shutdown	Server Admin	To shut down the server
-Super	Server Admin	To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
-Trigger	Tables	To use triggers
-Update	Tables	To update existing rows
-Usage	Server Admin	No privileges - allow connect only
 Variable_name	Value
 Tables_in_test (foo)
 Variable_name	Value
@@ -2526,36 +2497,6 @@ id	char(16)	NO			
 data	int(11)	NO		NULL	
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 Database	Table	In_use	Name_locked
-Privilege	Context	Comment
-Alter	Tables	To alter the table
-Alter routine	Functions,Procedures	To alter or drop stored functions/procedures
-Create	Databases,Tables,Indexes	To create new databases and tables
-Create routine	Functions,Procedures	To use CREATE FUNCTION/PROCEDURE
-Create temporary tables	Databases	To use CREATE TEMPORARY TABLE
-Create view	Tables	To create new views
-Create user	Server Admin	To create new users
-Delete	Tables	To delete existing rows
-Drop	Databases,Tables	To drop databases, tables, and views
-Event	Server Admin	To create, alter, drop and execute events
-Execute	Functions,Procedures	To execute stored routines
-File	File access on server	To read and write files on the server
-Grant option	Databases,Tables,Functions,Procedures	To give to other users those privileges you possess
-Index	Tables	To create or drop indexes
-Insert	Tables	To insert data into tables
-Lock tables	Databases	To use LOCK TABLES (together with SELECT privilege)
-Process	Server Admin	To view the plain text of currently executing queries
-References	Databases,Tables	To have references on tables
-Reload	Server Admin	To reload or refresh tables, logs and privileges
-Replication client	Server Admin	To ask where the slave or master servers are
-Replication slave	Server Admin	To read binary log events from the master
-Select	Tables	To retrieve rows from table
-Show databases	Server Admin	To see all databases with SHOW DATABASES
-Show view	Tables	To see views with SHOW CREATE VIEW
-Shutdown	Server Admin	To shut down the server
-Super	Server Admin	To use KILL thread, SET GLOBAL, CHANGE MASTER, etc.
-Trigger	Tables	To use triggers
-Update	Tables	To update existing rows
-Usage	Server Admin	No privileges - allow connect only
 Variable_name	Value
 Tables_in_test (foo)
 Variable_name	Value
diff -Nrup a/mysql-test/t/create.test b/mysql-test/t/create.test
--- a/mysql-test/t/create.test	2008-03-22 09:32:23 +01:00
+++ b/mysql-test/t/create.test	2008-05-13 14:06:28 +02:00
@@ -1279,17 +1279,6 @@ table_schema='test';
 show create table имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48;
 show create view имя_вью_кодировке_утф8_длиной_больше_чем_42;
 
-# procedure, function, event, trigger
-
-create event имя_события_в_кодировке_утф8_длиной_больше_чем_48 on schedule every 2 year do select 1;
-select EVENT_NAME from information_schema.events
-where event_schema='test';
-drop event имя_события_в_кодировке_утф8_длиной_больше_чем_48;
---error 1059
-create event
-очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_66
-on schedule every 2 year do select 1;
-
 create trigger имя_триггера_в_кодировке_утф8_длиной_больше_чем_49
 before insert on имя_таблицы_в_кодировке_утф8_длиной_больше_чем_48 for each row set @a:=1;
 select TRIGGER_NAME from information_schema.triggers where
diff -Nrup a/mysql-test/t/events_2.test b/mysql-test/t/events_2.test
--- a/mysql-test/t/events_2.test	2008-02-22 21:28:56 +01:00
+++ b/mysql-test/t/events_2.test	2008-05-13 14:06:28 +02:00
@@ -398,6 +398,18 @@ drop table t1|
 drop event e1|
 delimiter ;|
 
+#
+# Bug#21432 Database/Table name limited to 64 bytes, not chars, problems with multi-byte
+#
+set names utf8;
+create event имя_события_в_кодировке_утф8_длиной_больше_чем_48 on schedule every 2 year do select 1;
+select EVENT_NAME from information_schema.events
+where event_schema='test';
+drop event имя_события_в_кодировке_утф8_длиной_больше_чем_48;
+--error 1059
+create event
+очень_очень_очень_очень_очень_очень_очень_очень_длинная_строка_66
+on schedule every 2 year do select 1;
 
 # 
 # End of tests
diff -Nrup a/mysql-test/t/sp.test b/mysql-test/t/sp.test
--- a/mysql-test/t/sp.test	2008-02-17 13:57:22 +01:00
+++ b/mysql-test/t/sp.test	2008-05-13 14:06:28 +02:00
@@ -2945,7 +2945,8 @@ begin
   show columns from t1;
   show keys from t1;
   show open tables like 'foo';
-  show privileges;
+  # Removed because result will differ in embedded mode.
+  #show privileges;
   show status like 'foo';
   show tables like 'foo';
   show variables like 'foo';
Thread
bk commit into 5.1 tree (thek:1.2626) BUG#35997kpettersson13 May