diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-06-29 19:35:08 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-07-03 14:04:34 +0300 |
| commit | 4b0f1284eeb633f091f2e93220661fc6888b1abc (patch) | |
| tree | f2da8ea93676d23e7578fa8e8fee0ecce6c0aeff /sql/sql_partition.cc | |
| parent | 177e477553bf0d2dd976971a1edf7b400f1aa265 (diff) | |
| download | mariadb-git-4b0f1284eeb633f091f2e93220661fc6888b1abc.tar.gz | |
SQL: revisit error messages [closes #217]
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index caca441e5e4..7278b56a017 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -5368,7 +5368,8 @@ that are reorganised. { if (num_parts_dropped >= tab_part_info->num_parts - 1) { - my_error(ER_VERS_WRONG_PARAMS, MYF(0), "BY SYSTEM_TIME", "one `AS OF NOW` and at least one `VERSIONING` partition required"); + DBUG_ASSERT(table && table->s && table->s->table_name.str); + my_error(ER_VERS_WRONG_PARTS, MYF(0), table->s->table_name.str); goto err; } } @@ -5394,7 +5395,8 @@ that are reorganised. { if (part_elem->type == partition_element::AS_OF_NOW) { - my_error(ER_VERS_WRONG_PARAMS, MYF(0), "BY SYSTEM_TIME", "`AS OF NOW` partition can not be dropped"); + DBUG_ASSERT(table && table->s && table->s->table_name.str); + my_error(ER_VERS_WRONG_PARTS, MYF(0), table->s->table_name.str); goto err; } /* |