database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge dator6.(none):/home/mikael/mysql_clones/bug32943

Browse Source 
into  dator6.(none):/home/mikael/mysql_clones/mysql-5.1-engines


sql/sql_partition.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
mysql-test/r/partition_range.result:
  manual merge
mysql-test/t/partition_range.test:
  manual merge
This commit is contained in:
unknown
2008-02-13 11:29:50 +01:00
parent 911a85d548 3fce8cf105
commit a7f2f9514e
91 changed files with 63678 additions and 15382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_partition.cc
View File

@@ -4313,7 +4313,12 @@ uint prep_alter_part_table(THD *thd, TABLE *table, Alter_info *alter_info,
{
my_error(ER_NO_BINLOG_ERROR, MYF(0));
DBUG_RETURN(TRUE);
}
}
if (tab_part_info->defined_max_value)
{
my_error(ER_PARTITION_MAXVALUE_ERROR, MYF(0));
DBUG_RETURN(TRUE);
}
if (no_new_partitions == 0)
{
my_error(ER_ADD_PARTITION_NO_NEW_PARTITION, MYF(0));