diff options
| author | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-21 09:30:19 -0400 |
|---|---|---|
| committer | unknown <mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-04-21 09:30:19 -0400 |
| commit | 34a11a322d5a534cceec4d13293a491cf5077c0d (patch) | |
| tree | 3339db78538bb6460acbe9b5f921a17b228744fd /sql/partition_info.cc | |
| parent | 328da025e0f5d69507d865977f9b68f4af9126d9 (diff) | |
| parent | 17e3ee35531d0003de31093570e64f604bd8c4fa (diff) | |
| download | mariadb-git-34a11a322d5a534cceec4d13293a491cf5077c0d.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug18198
into c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug18198
sql/item_timefunc.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/share/errmsg.txt:
manual merge
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index c957efa71fb..a62b58a04ac 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -708,6 +708,12 @@ bool partition_info::check_partition_info(handlerton **eng_type, partition_element *part_elem= part_it++; if (!is_sub_partitioned()) { + if (check_table_name(part_elem->partition_name, + strlen(part_elem->partition_name))) + { + my_error(ER_WRONG_PARTITION_NAME, MYF(0)); + goto end; + } if (part_elem->engine_type == NULL) part_elem->engine_type= default_engine_type; DBUG_PRINT("info", ("engine = %d", @@ -721,6 +727,12 @@ bool partition_info::check_partition_info(handlerton **eng_type, do { part_elem= sub_it++; + if (check_table_name(part_elem->partition_name, + strlen(part_elem->partition_name))) + { + my_error(ER_WRONG_PARTITION_NAME, MYF(0)); + goto end; + } if (part_elem->engine_type == NULL) part_elem->engine_type= default_engine_type; DBUG_PRINT("info", ("engine = %u", |