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

WL 2826: Error handling of ALTER TABLE for partitioning

Browse Source 
Fixed merge issue


sql/sql_partition.cc:
  Added some debug printouts
sql/sql_table.cc:
  Fixed merge issue
This commit is contained in:
unknown 2006-04-22 04:38:19 -04:00
parent a52bd573de
commit fd40f0dd1d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_partition.cc
View File

@ -4532,6 +4532,7 @@ the generated partition syntax in a correct manner.
/* /*
Make sure change of engine happens to all partitions. Make sure change of engine happens to all partitions.
*/ */
DBUG_PRINT("info", ("partition changed"));
set_engine_all_partitions(thd->work_part_info, create_info->db_type); set_engine_all_partitions(thd->work_part_info, create_info->db_type);
*partition_changed= TRUE; *partition_changed= TRUE;
} }
@ -4546,7 +4547,10 @@ the generated partition syntax in a correct manner.
using the partition handler. using the partition handler.
*/ */
if (thd->work_part_info != table->part_info) if (thd->work_part_info != table->part_info)
{
DBUG_PRINT("info", ("partition changed"));
*partition_changed= TRUE; *partition_changed= TRUE;
}
if (create_info->db_type == &partition_hton) if (create_info->db_type == &partition_hton)
part_info->default_engine_type= table->part_info->default_engine_type; part_info->default_engine_type= table->part_info->default_engine_type;
else else

2
sql/sql_table.cc
View File

@ -5990,7 +5990,7 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
VOID(pthread_mutex_lock(&LOCK_open)); VOID(pthread_mutex_lock(&LOCK_open));
} }
/* Tell the handler that a new frm file is in place. */ /* Tell the handler that a new frm file is in place. */
if (table->file->create_handler_files(reg_path, NULL, CHF_INDEX_FLAG, if (table->file->create_handler_files(path, NULL, CHF_INDEX_FLAG,
create_info)) create_info))
{ {
VOID(pthread_mutex_unlock(&LOCK_open)); VOID(pthread_mutex_unlock(&LOCK_open));