database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Merge mysql.com:/home/hf/work/27359/my51-27359

Browse Source 
into  mysql.com:/home/hf/work/my_mrg/my51-my_mrg
This commit is contained in:
holyfoot/hf@hfmain.(none)
2007-04-04 14:20:00 +05:00
parent d7352bdd3e e44f0a2a2c
commit cba85dba20
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/ndb_partition_error2.result Normal file
View File

@@ -0,0 +1,3 @@
drop table if exists t1;
create table t1 (s1 int) engine=ndbcluster;
ERROR HY000: For the partitioned engine it is necessary to define all partitions

1
mysql-test/t/ndb_partition_error2-master.opt Normal file
View File

@@ -0,0 +1 @@
--ndbcluster

14
mysql-test/t/ndb_partition_error2.test Normal file
View File

@@ -0,0 +1,14 @@
disable_query_log;
--require r/true.require
select support = 'Enabled' as `TRUE` from information_schema.engines where engine = 'ndbcluster';
enable_query_log;
--disable_warnings
drop table if exists t1;
--enable_warnings
#
# Bug #27359 Partitions: memory allocation error message
#
--error ER_PARTITION_NOT_DEFINED_ERROR
create table t1 (s1 int) engine=ndbcluster;

6
sql/partition_info.cc
View File

@@ -753,7 +753,11 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
}
if (unlikely(set_up_defaults_for_partitioning(file, info, (uint)0)))
goto end;
tot_partitions= get_tot_partitions();
if (!(tot_partitions= get_tot_partitions()))
{
my_error(ER_PARTITION_NOT_DEFINED_ERROR, MYF(0), "partitions");
goto end;
}
if (unlikely(tot_partitions > MAX_PARTITIONS))
{
my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0));