Skip to content

Commit 1a0b986

Browse files
vuvovamidenok
authored andcommitted
MDEV-14764 Confusing error message: Table t1 must have at least one temporal column
compiler warning (mix of bool and enum in ?:)
1 parent 5dddbaf commit 1a0b986

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

mysql-test/suite/versioning/r/alter.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Warnings:
447447
Warning 124 InnoDB rebuilding table to add column FTS_DOC_ID
448448
create or replace table t (a int) with system versioning;
449449
alter table t drop column a;
450-
ERROR HY000: Table `t` must have at least one temporal column
450+
ERROR HY000: Table `t` must have at least one versioned column
451451
alter table t drop column a, drop column a;
452452
ERROR 42000: Can't DROP COLUMN `a`; check that it exists
453453
drop database test;

mysql-test/suite/versioning/r/create.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ x21 int without system versioning
164164
create or replace table t1 (
165165
x22 int without system versioning
166166
) with system versioning;
167-
ERROR HY000: Table `t1` must have at least one temporal column
167+
ERROR HY000: Table `t1` must have at least one versioned column
168168
create or replace table t1 (a int) with system versioning;
169169
create table tt1 like t1;
170170
show create table tt1;

sql/share/errmsg-utf8.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7880,7 +7880,7 @@ ER_VERS_DIFFERENT_TABLES
78807880
eng "Wrong parameters for %`s: system fields selected from different tables"
78817881

78827882
ER_VERS_TABLE_MUST_HAVE_COLUMNS
7883-
eng "Table %`s must have at least one temporal column"
7883+
eng "Table %`s must have at least one versioned column"
78847884

78857885
ER_VERS_NOT_VERSIONED
78867886
eng "Table %`s is not system-versioned"

sql/sql_base.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7649,7 +7649,7 @@ insert_fields(THD *thd, Name_resolution_context *context, const char *db_name,
76497649
if ((field= field_iterator.field()) &&
76507650
(field->vers_sys_field() ?
76517651
field->vers_sys_invisible(thd) :
7652-
field->invisible))
7652+
field->invisible != VISIBLE))
76537653
{
76547654
continue;
76557655
}

0 commit comments

Comments
 (0)