diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-21 10:25:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-11-21 10:25:38 +0200 |
| commit | b35a048ece4f5dd7c6757d86a303f27187a16117 (patch) | |
| tree | 707189e5b00169b61b9ec13608625b938bd4f35b /sql/sql_lex.cc | |
| parent | 91a7e9eb1ef9bfba6a1da5bca4a9b8c58a94c245 (diff) | |
| parent | 5b1eb87b6fc9cd09d5a0ffcd926203700e035689 (diff) | |
| download | mariadb-git-b35a048ece4f5dd7c6757d86a303f27187a16117.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'sql/sql_lex.cc')
| -rw-r--r-- | sql/sql_lex.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 68c1fbf5447..fd3550abad7 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -9740,6 +9740,7 @@ bool Lex_ident_sys_st::to_size_number(ulonglong *to) const } +#ifdef WITH_PARTITION_STORAGE_ENGINE bool LEX::part_values_current(THD *thd) { partition_element *elem= part_info->curr_part_elem; @@ -9747,7 +9748,7 @@ bool LEX::part_values_current(THD *thd) { if (unlikely(part_info->part_type != VERSIONING_PARTITION)) { - my_error(ER_PARTITION_WRONG_TYPE, MYF(0), "SYSTEM_TIME"); + part_type_error(thd, NULL, "SYSTEM_TIME", part_info); return true; } } @@ -9774,7 +9775,7 @@ bool LEX::part_values_history(THD *thd) { if (unlikely(part_info->part_type != VERSIONING_PARTITION)) { - my_error(ER_PARTITION_WRONG_TYPE, MYF(0), "SYSTEM_TIME"); + part_type_error(thd, NULL, "SYSTEM_TIME", part_info); return true; } } @@ -9799,6 +9800,7 @@ bool LEX::part_values_history(THD *thd) elem->type= partition_element::HISTORY; return false; } +#endif /* WITH_PARTITION_STORAGE_ENGINE */ bool LEX::last_field_generated_always_as_row_start_or_end(Lex_ident *p, |