database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-14764 Confusing error message: Table t1 must have at least one temporal column

Browse Source 
compiler warning (mix of bool and enum in ?:)
This commit is contained in:
Sergei Golubchik
2017-12-27 15:16:17 +01:00
committed by Aleksey Midenkov
parent 5dddbafa4e
commit 1a0b986e78
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/versioning/r/alter.result
View File

@@ -447,7 +447,7 @@ Warnings:
Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID
create or replace table t (a int) with system versioning; create or replace table t (a int) with system versioning;
alter table t drop column a; alter table t drop column a;
ERROR HY000: Table `t` must have at least one temporal column ERROR HY000: Table `t` must have at least one versioned column
alter table t drop column a, drop column a; alter table t drop column a, drop column a;
ERROR 42000: Can't DROP COLUMN `a`; check that it exists ERROR 42000: Can't DROP COLUMN `a`; check that it exists
drop database test; drop database test;

2
mysql-test/suite/versioning/r/create.result
View File

@@ -164,7 +164,7 @@ x21 int without system versioning
create or replace table t1 ( create or replace table t1 (
x22 int without system versioning x22 int without system versioning
) with system versioning; ) with system versioning;
ERROR HY000: Table `t1` must have at least one temporal column ERROR HY000: Table `t1` must have at least one versioned column
create or replace table t1 (a int) with system versioning; create or replace table t1 (a int) with system versioning;
create table tt1 like t1; create table tt1 like t1;
show create table tt1; show create table tt1;

2
sql/share/errmsg-utf8.txt
View File

@@ -7880,7 +7880,7 @@ ER_VERS_DIFFERENT_TABLES
eng "Wrong parameters for %`s: system fields selected from different tables" eng "Wrong parameters for %`s: system fields selected from different tables"
ER_VERS_TABLE_MUST_HAVE_COLUMNS ER_VERS_TABLE_MUST_HAVE_COLUMNS
eng "Table %`s must have at least one temporal column" eng "Table %`s must have at least one versioned column"
ER_VERS_NOT_VERSIONED ER_VERS_NOT_VERSIONED
eng "Table %`s is not system-versioned" eng "Table %`s is not system-versioned"

2
sql/sql_base.cc
View File

@@ -7649,7 +7649,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
if ((field= field_iterator.field()) && if ((field= field_iterator.field()) &&
(field->vers_sys_field() ? (field->vers_sys_field() ?
field->vers_sys_invisible(thd) : field->vers_sys_invisible(thd) :
field->invisible)) field->invisible != VISIBLE))
{ {
continue; continue;
} }