diff options
| author | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-05 13:25:39 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/hfmain.(none)> | 2007-04-05 13:25:39 +0500 |
| commit | 46b3cf174de810803f57c704f566a0a8b80725d5 (patch) | |
| tree | 904899f40d9e985376f1abb1d664268dd2fe28e6 /sql/partition_info.cc | |
| parent | 368a7b6dc39cfabe151349512b4efaae519d116f (diff) | |
| download | mariadb-git-46b3cf174de810803f57c704f566a0a8b80725d5.tar.gz | |
aftermerging fix
sql/partition_info.cc:
here we have to check for zero return from file->get_default_no_partitions
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index 6444d54ea5d..3e0257f5b1d 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -187,8 +187,14 @@ bool partition_info::set_up_default_partitions(handler *file, my_error(ER_PARTITIONS_MUST_BE_DEFINED_ERROR, MYF(0), error_string); goto end; } - if (no_parts == 0) - no_parts= file->get_default_no_partitions(info); + + if ((no_parts == 0) && + ((no_parts= file->get_default_no_partitions(info)) == 0)) + { + my_error(ER_PARTITION_NOT_DEFINED_ERROR, MYF(0), "partitions"); + goto end; + } + if (unlikely(no_parts > MAX_PARTITIONS)) { my_error(ER_TOO_MANY_PARTITIONS_ERROR, MYF(0)); |