bk commit into 5.1 tree (andrey:1.2355) BUG#22369

[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@stripped, 2006-12-07 13:57:39+01:00, andrey@stripped +3 -0
  Additional fix for bug#22369

  mysql-test/t/events_bugs.test@stripped, 2006-12-07 13:57:27+01:00, andrey@stripped +1 -1
    let events_bugs not fail because of timing

  sql/sql_table.cc@stripped, 2006-12-07 13:57:27+01:00, andrey@stripped +9 -0
    if the db or name has been changed ALTER_RENAME,
    then fix table_list
    Solution by having the second table added in the parser to the
    list of used tables, won't work because checking of rights of merge
    tables goes over table_list->next_local and checks the rights, so
    we will fail there.

  sql/sql_yacc.yy@stripped, 2006-12-07 13:57:27+01:00, andrey@stripped +1 -1
    fix name - prevents ddd from correct working

# 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:	example.com
# Root:	/work/mysql-5.1-maint

--- 1.378/sql/sql_table.cc	2006-12-07 13:57:53 +01:00
+++ 1.379/sql/sql_table.cc	2006-12-07 13:57:53 +01:00
@@ -6527,6 +6527,15 @@ view_err:
   {
     if (! table)
     {
+      if (new_name != table_name || new_db != db)
+      {
+        table_list->alias= new_name;
+        table_list->table_name= new_name;
+        table_list->table_name_length= strlen(new_name);
+        table_list->db= new_db;
+        table_list->db_length= strlen(new_db);
+      }
+
       VOID(pthread_mutex_unlock(&LOCK_open));
       if (! (table= open_ltable(thd, table_list, TL_WRITE_ALLOW_READ)))
         goto err;

--- 1.523/sql/sql_yacc.yy	2006-12-07 13:57:53 +01:00
+++ 1.524/sql/sql_yacc.yy	2006-12-07 13:57:53 +01:00
@@ -4868,7 +4868,7 @@ alter_commands:
         | remove_partitioning
         | partitioning
 /*
+  This part was added for release 5.1 by Mikael Ronström.
   From here we insert a number of commands to manage the partitions of a
   partitioned table such as adding partitions, dropping partitions,
   reorganising partitions in various manners. In future releases the list

--- 1.21/mysql-test/t/events_bugs.test	2006-12-07 13:57:53 +01:00
+++ 1.22/mysql-test/t/events_bugs.test	2006-12-07 13:57:53 +01:00
@@ -280,7 +280,7 @@ create event e22830_3 on schedule every 
 create event e22830_4 on schedule every 1 hour do alter event e22830_4 on schedule every (select f22830() from dual) hour;
 select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name;
 set global event_scheduler=on;
---sleep 2.4
+--sleep 4
 set global event_scheduler=off;
 select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name;
 drop function f22830;