Commit e54bbaa3 authored by unknown's avatar unknown
Browse files

Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 

into  example.com:/work/mysql-5.1-maint
parents 1fb5bd37 0a22a1b9

mysql-test/t/events_bugs.test

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ create event e22830_3 on schedule every 1 hour do alter event e22830_3 on schedu 
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;

sql/sql_table.cc

+9 −0
Original line number Diff line number Diff line
@@ -6527,6 +6527,15 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name, 
  {

    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;

sql/sql_yacc.yy

+1 −1
Original line number Diff line number Diff line
@@ -4868,7 +4868,7 @@ alter_commands: 
        | remove_partitioning

        | partitioning

/*

  This part was added for release 5.1 by Mikael Ronstrm.

  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