summaryrefslogtreecommitdiff
path: root/sql/handler.h
diff options
context:
space:
mode:
authorEugene Kosov <claprix@yandex.ru>2019-05-10 16:21:22 +0300
committerSergei Golubchik <serg@mariadb.org>2019-05-17 13:53:22 +0200
commit3d649c6e37de47336860bee6d23804d62a0746cb (patch)
treeab4eafed33f5f88832bd4f9b72e5baba5989b756 /sql/handler.h
parent3d56adbfac394b2b3ffd22a89fe7c2978ed9a505 (diff)
downloadmariadb-git-3d649c6e37de47336860bee6d23804d62a0746cb.tar.gz
MDEV-15408 Confusing error message upon ER_VERS_FIELD_WRONG_TYPE while omitting UNSIGNED in BIGINT
Improve diagnostics. Try to guess what type user tried to type.
Diffstat (limited to 'sql/handler.h')
-rw-r--r--sql/handler.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/handler.h b/sql/handler.h
index 1c336e7e35f..2209bd4071c 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1924,7 +1924,6 @@ extern const LEX_CSTRING null_clex_str;
struct Vers_parse_info
{
Vers_parse_info() :
- check_unit(VERS_UNDEFINED),
versioned_fields(false),
unversioned_fields(false)
{}
@@ -1933,7 +1932,6 @@ struct Vers_parse_info
{
system_time= start_end_t(null_clex_str, null_clex_str);
as_row= start_end_t(null_clex_str, null_clex_str);
- check_unit= VERS_UNDEFINED;
versioned_fields= false;
unversioned_fields= false;
}
@@ -1951,7 +1949,6 @@ struct Vers_parse_info
start_end_t system_time;
start_end_t as_row;
- vers_sys_type_t check_unit;
void set_system_time(Lex_ident start, Lex_ident end)
{
@@ -1993,7 +1990,7 @@ public:
TABLE_LIST &src_table, TABLE_LIST &table);
bool check_sys_fields(const Lex_table_name &table_name,
const Lex_table_name &db,
- Alter_info *alter_info);
+ Alter_info *alter_info, bool can_native);
/**
At least one field was specified 'WITH/WITHOUT SYSTEM VERSIONING'.