diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-04 14:20:00 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-04 14:20:00 +0500 |
| commit | d3a2682588002a51e9a425dd875f6e2782e28643 (patch) | |
| tree | a2b00fff2171aef057d2671131f46b34f25b0f59 /sql/partition_info.cc | |
| parent | 0a9e85e04dd88d073147938d02d6bb8895b29b10 (diff) | |
| parent | a16d1fd4389fc0a07522b442934ab22f19ae83c1 (diff) | |
| download | mariadb-git-d3a2682588002a51e9a425dd875f6e2782e28643.tar.gz | |
Merge mysql.com:/home/hf/work/27359/my51-27359
into mysql.com:/home/hf/work/my_mrg/my51-my_mrg
sql/partition_info.cc:
Auto merged
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index e0d2236d804..6444d54ea5d 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -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)); |