database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into mysql.com:/home/gluh/MySQL/Merge/5.1-kt
This commit is contained in:
gluh@eagle.intranet.mysql.r18.ru
2006-06-28 11:55:15 +05:00
parent 0ccd44cdf2 a23259c2ef
commit 3e22ea44e5
50 changed files with 1009 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_partition.cc
View File

@ -3823,14 +3823,13 @@ uint prep_alter_part_table(THD *thd, TABLE *table, ALTER_INFO *alter_info,
if (alter_info->flags == ALTER_TABLE_REORG)
{
uint new_part_no, curr_part_no;
ulonglong max_rows= table->s->max_rows;
if (tab_part_info->part_type != HASH_PARTITION ||
tab_part_info->use_default_no_partitions)
{
my_error(ER_REORG_NO_PARAM_ERROR, MYF(0));
DBUG_RETURN(TRUE);
}
new_part_no= table->file->get_default_no_partitions(max_rows);
new_part_no= table->file->get_default_no_partitions(create_info);
curr_part_no= tab_part_info->no_parts;
if (new_part_no == curr_part_no)
{