1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
into  example.com:/work/mysql-5.1-maint
This commit is contained in:
andrey@example.com 2006-12-07 13:58:56 +01:00
commit c24381bdaa
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/events_bugs.test
View File

@ -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; 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; select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name;
set global event_scheduler=on; set global event_scheduler=on;
--sleep 2.4 --sleep 4
set global event_scheduler=off; set global event_scheduler=off;
select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name; select event_name, event_definition, interval_value, interval_field from information_schema.events order by event_name;
drop function f22830; drop function f22830;

9
sql/sql_table.cc
View File

@ -6527,6 +6527,15 @@ view_err:
{ {
if (! table) 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)); VOID(pthread_mutex_unlock(&LOCK_open));
if (! (table= open_ltable(thd, table_list, TL_WRITE_ALLOW_READ))) if (! (table= open_ltable(thd, table_list, TL_WRITE_ALLOW_READ)))
goto err; goto err;

2
sql/sql_yacc.yy
View File

@ -4868,7 +4868,7 @@ alter_commands:
| remove_partitioning | remove_partitioning
| partitioning | partitioning
/* /*
This part was added for release 5.1 by Mikael Ronström. 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 From here we insert a number of commands to manage the partitions of a
partitioned table such as adding partitions, dropping partitions, partitioned table such as adding partitions, dropping partitions,
reorganising partitions in various manners. In future releases the list reorganising partitions in various manners. In future releases the list