From b3fe45bcd467934edf7b0c4645b27fcee7fd6fab Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 4 Dec 2017 18:41:07 +0100 Subject: [PATCH] rephrase error messages, fix quoting --- mysql-test/r/ctype_upgrade.result | 4 +- mysql-test/r/mysqlcheck.result | 4 +- .../suite/binlog/r/binlog_base64_flag.result | 2 +- mysql-test/suite/versioning/r/alter.result | 24 +++--- mysql-test/suite/versioning/r/create.result | 16 ++-- mysql-test/suite/versioning/t/create.test | 8 +- sql/handler.cc | 15 +--- sql/share/errmsg-utf8.txt | 76 +++++++++---------- 8 files changed, 69 insertions(+), 80 deletions(-) diff --git a/mysql-test/r/ctype_upgrade.result b/mysql-test/r/ctype_upgrade.result index 14f46eecde7..8c2e72e3084 100644 --- a/mysql-test/r/ctype_upgrade.result +++ b/mysql-test/r/ctype_upgrade.result @@ -8,7 +8,7 @@ CHECK TABLE maria050313_utf8_croatian_ci FOR UPGRADE; Table Op Msg_type Msg_text test.maria050313_utf8_croatian_ci check error Upgrade required. Please do "REPAIR TABLE `maria050313_utf8_croatian_ci`" or dump/reload to fix it! SHOW CREATE TABLE maria050313_utf8_croatian_ci; -ERROR HY000: Table rebuild required. Please do "ALTER TABLE `test.maria050313_utf8_croatian_c` FORCE" or dump/reload to fix it! +ERROR HY000: Table rebuild required. Please do "ALTER TABLE `test.maria050313_utf8_croatian_ci` FORCE" or dump/reload to fix it! REPAIR TABLE maria050313_utf8_croatian_ci; Table Op Msg_type Msg_text test.maria050313_utf8_croatian_ci repair status OK @@ -45,7 +45,7 @@ CHECK TABLE maria050313_ucs2_croatian_ci_def FOR UPGRADE; Table Op Msg_type Msg_text test.maria050313_ucs2_croatian_ci_def check error Upgrade required. Please do "REPAIR TABLE `maria050313_ucs2_croatian_ci_def`" or dump/reload to fix it! SELECT count(*) FROM maria050313_ucs2_croatian_ci_def; -ERROR HY000: Table rebuild required. Please do "ALTER TABLE `test.maria050313_ucs2_croatian_c` FORCE" or dump/reload to fix it! +ERROR HY000: Table rebuild required. Please do "ALTER TABLE `test.maria050313_ucs2_croatian_ci_def` FORCE" or dump/reload to fix it! REPAIR TABLE maria050313_ucs2_croatian_ci_def; Table Op Msg_type Msg_text test.maria050313_ucs2_croatian_ci_def repair status OK diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result index c6ce2b465da..300f9340b96 100644 --- a/mysql-test/r/mysqlcheck.result +++ b/mysql-test/r/mysqlcheck.result @@ -73,7 +73,7 @@ status : OK mysql.user OK mysql.vtmd_template note : Table does not support optimize, doing recreate + analyze instead -error : Not allowed for versioned `mysql.vtmd_template`. Change `versioning_alter_history` to proceed with ALTER. +error : Not allowed for versioned `mysql`.`vtmd_template`. Change `versioning_alter_history` to proceed with ALTER. status : Operation failed mysql.column_stats OK mysql.columns_priv OK @@ -142,7 +142,7 @@ status : OK mysql.user Table is already up to date mysql.vtmd_template note : Table does not support optimize, doing recreate + analyze instead -error : Not allowed for versioned `mysql.vtmd_template`. Change `versioning_alter_history` to proceed with ALTER. +error : Not allowed for versioned `mysql`.`vtmd_template`. Change `versioning_alter_history` to proceed with ALTER. status : Operation failed create table t1 (a int) engine=myisam; create view v1 as select * from t1; diff --git a/mysql-test/suite/binlog/r/binlog_base64_flag.result b/mysql-test/suite/binlog/r/binlog_base64_flag.result index 735a27919ea..f9634e0713f 100644 --- a/mysql-test/suite/binlog/r/binlog_base64_flag.result +++ b/mysql-test/suite/binlog/r/binlog_base64_flag.result @@ -9,7 +9,7 @@ BINLOG ' SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE= SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA== '; -ERROR HY000: The BINLOG statement of type `Table_map` was not preceded by a format description BINLOG statement +ERROR HY000: The BINLOG statement of type Table_map was not preceded by a format description BINLOG statement select * from t1; a 1 diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result index 61efbbdb96f..1c1f3044414 100644 --- a/mysql-test/suite/versioning/r/alter.result +++ b/mysql-test/suite/versioning/r/alter.result @@ -10,7 +10,7 @@ t CREATE TABLE `t` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t drop system versioning; -ERROR HY000: Wrong parameters for `t`: table is not versioned +ERROR HY000: Table `t` is not versioned alter table t add system versioning; show create table t; Table Create Table @@ -21,9 +21,9 @@ t CREATE TABLE `t` ( PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`) ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING alter table t add column y int; -ERROR HY000: Not allowed for versioned `test.t`. Change `versioning_alter_history` to proceed with ALTER. +ERROR HY000: Not allowed for versioned `test`.`t`. Change `versioning_alter_history` to proceed with ALTER. alter table t engine innodb; -ERROR HY000: Not allowed for versioned `test.t`. Change to/from native versioning engine is prohibited. +ERROR HY000: Not allowed for versioned `test`.`t`. Change to/from native versioning engine is prohibited. alter table t drop system versioning; show create table t; Table Create Table @@ -36,13 +36,13 @@ add column trx_start bigint(20) unsigned generated always as row start, add column trx_end bigint(20) unsigned generated always as row end, add period for system_time(trx_start, trx_end), add system versioning; -ERROR HY000: `trx_start` must be of type `TIMESTAMP(6)` for versioned table `t` +ERROR HY000: `trx_start` must be of type TIMESTAMP(6) for versioned table `t` alter table t add column trx_start timestamp generated always as row start, add column trx_end timestamp generated always as row end, add period for system_time(trx_start, trx_end), add system versioning; -ERROR HY000: `trx_start` must be of type `TIMESTAMP(6)` for versioned table `t` +ERROR HY000: `trx_start` must be of type TIMESTAMP(6) for versioned table `t` alter table t add column trx_start timestamp(6) not null generated always as row start, add column trx_end timestamp(6) not null generated always as row end, @@ -231,9 +231,9 @@ t CREATE TABLE `t` ( `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 alter table t modify a int with system versioning; -ERROR HY000: Wrong parameters for `t`: table is not versioned +ERROR HY000: Table `t` is not versioned alter table t modify a int without system versioning; -ERROR HY000: Wrong parameters for `t`: table is not versioned +ERROR HY000: Table `t` is not versioned alter table t add system versioning; alter table t modify a int without system versioning; show create table t; @@ -267,7 +267,7 @@ add column trx_start timestamp(6) generated always as row start, add column trx_end timestamp(6) generated always as row end, add period for system_time(trx_start, trx_end), add system versioning; -ERROR HY000: `trx_start` must be of type `BIGINT(20) UNSIGNED` for versioned table `t` +ERROR HY000: `trx_start` must be of type BIGINT(20) UNSIGNED for versioned table `t` call verify_vtq; No A B C D alter table t @@ -494,7 +494,7 @@ sys_trx_end bigint(20) unsigned generated always as row end, period for system_time(sys_trx_start, sys_trx_end) ) with system versioning engine innodb; alter table t change column sys_trx_start asdf bigint unsigned; -ERROR HY000: Can not change system versioning field 'sys_trx_start' +ERROR HY000: Can not change system versioning field `sys_trx_start` create or replace table t ( a int, sys_trx_start timestamp(6) generated always as row start, @@ -502,7 +502,7 @@ sys_trx_end timestamp(6) generated always as row end, period for system_time(sys_trx_start, sys_trx_end) ) with system versioning engine myisam; alter table t change column sys_trx_start asdf timestamp(6); -ERROR HY000: Can not change system versioning field 'sys_trx_start' +ERROR HY000: Can not change system versioning field `sys_trx_start` create or replace table t ( a int, sys_trx_start timestamp(6) generated always as row start, @@ -512,12 +512,12 @@ period for system_time(sys_trx_start, sys_trx_end) select * from t; a sys_trx_start sys_trx_end alter table t drop system versioning; -ERROR HY000: System versioning field 'sys_trx_start' is not hidden +ERROR HY000: System versioning field `sys_trx_start` is not hidden alter table t drop column sys_trx_start; select * from t; a sys_trx_end alter table t drop system versioning; -ERROR HY000: System versioning field 'sys_trx_end' is not hidden +ERROR HY000: System versioning field `sys_trx_end` is not hidden alter table t drop column sys_trx_end; select * from t; a diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result index 857b283fbaa..4874aeaaf70 100644 --- a/mysql-test/suite/versioning/r/create.result +++ b/mysql-test/suite/versioning/r/create.result @@ -41,14 +41,14 @@ Sys_start2 SYS_TRX_TYPE generated always as row start, Sys_end SYS_TRX_TYPE generated always as row end, period for system_time (Sys_start, Sys_end) ) with system versioning; -ERROR HY000: Wrong parameters for `t1`: mismatch 'PERIOD FOR SYSTEM_TIME' and 'AS ROW START' +ERROR HY000: PERIOD FOR SYSTEM_TIME must use columns `Sys_start2` and `Sys_end` create or replace table t1 ( x4 int unsigned, Sys_start SYS_TRX_TYPE generated always as row start, Sys_end2 SYS_TRX_TYPE generated always as row end, period for system_time (Sys_start, Sys_end) ) with system versioning; -ERROR HY000: Wrong parameters for `t1`: mismatch 'PERIOD FOR SYSTEM_TIME' and 'AS ROW END' +ERROR HY000: PERIOD FOR SYSTEM_TIME must use columns `Sys_start` and `Sys_end2` create or replace table t1 ( x5 int unsigned, Sys_start SYS_TRX_TYPE generated always as row start, @@ -56,7 +56,7 @@ Sys_end SYS_TRX_TYPE generated always as row end, Sys_end2 SYS_TRX_TYPE generated always as row end, period for system_time (Sys_start, Sys_end) ) with system versioning; -ERROR HY000: Wrong parameters for `t1`: mismatch 'PERIOD FOR SYSTEM_TIME' and 'AS ROW END' +ERROR HY000: PERIOD FOR SYSTEM_TIME must use columns `Sys_start` and `Sys_end2` create or replace table t1 ( x6 int unsigned, period for system_time (Sys_start, Sys_end) @@ -76,7 +76,7 @@ Sys_start SYS_TRX_TYPE generated always as row start, Sys_end SYS_TRX_TYPE generated always as row end, period for system_time (sys_insert, sys_remove) ) with system versioning; -ERROR HY000: Wrong parameters for `t1`: mismatch 'PERIOD FOR SYSTEM_TIME' and 'AS ROW START' +ERROR HY000: PERIOD FOR SYSTEM_TIME must use columns `Sys_start` and `Sys_end` create or replace table t1 ( x9 int unsigned, Sys_start SYS_TRX_TYPE generated always as row start, @@ -111,14 +111,14 @@ Sys_start bigint generated always as row start, Sys_end bigint unsigned generated always as row end, period for system_time (Sys_start, Sys_end) ) with system versioning engine innodb; -ERROR HY000: `Sys_start` must be of type `BIGINT(20) UNSIGNED` for versioned table `t1` +ERROR HY000: `Sys_start` must be of type BIGINT(20) UNSIGNED for versioned table `t1` create or replace table t1 ( x14 int unsigned, Sys_start bigint unsigned generated always as row start, Sys_end bigint generated always as row end, period for system_time (Sys_start, Sys_end) ) with system versioning engine innodb; -ERROR HY000: `Sys_end` must be of type `BIGINT(20) UNSIGNED` for versioned table `t1` +ERROR HY000: `Sys_end` must be of type BIGINT(20) UNSIGNED for versioned table `t1` create or replace table t1 ( A1 int with system versioning, B int @@ -194,7 +194,7 @@ A7 int without system versioning create or replace table t1 ( A8 int without system versioning ) with system versioning; -ERROR HY000: Wrong parameters for `t1`: no columns defined 'WITH SYSTEM VERSIONING' +ERROR HY000: Table `t1` has no versioned columns create or replace table t1 (a int) with system versioning; create table tt1 like t1; show create table tt1; @@ -289,7 +289,7 @@ y create or replace table t1 (a int) with system versioning engine INNODB_OR_MYISAM; create or replace table t2 as select a, sys_trx_start, sys_trx_end from t1 for system_time all; create or replace table t2 with system versioning engine INNODB_OR_MYISAM as select a, sys_trx_start, sys_trx_end from t1 for system_time all; -ERROR HY000: `sys_trx_start` must be of type `SYS_TRX_TYPE` for versioned table `t2` +ERROR HY000: `sys_trx_start` must be of type SYS_TRX_TYPE for versioned table `t2` create or replace table t1 (a int, id int) with system versioning engine INNODB_OR_MYISAM; create or replace table t2 (b int, id int); create or replace table t3 as diff --git a/mysql-test/suite/versioning/t/create.test b/mysql-test/suite/versioning/t/create.test index 903ff997f12..caef5d59d6c 100644 --- a/mysql-test/suite/versioning/t/create.test +++ b/mysql-test/suite/versioning/t/create.test @@ -39,7 +39,7 @@ create or replace table t1 ( show create table t1; --replace_result "bigint unsigned" SYS_TRX_TYPE timestamp(6) SYS_TRX_TYPE ---error ER_MISMATCH +--error ER_VERS_PERIOD_COLUMNS eval create or replace table t1 ( x3 int unsigned, Sys_start $sys_datatype generated always as row start, @@ -49,7 +49,7 @@ eval create or replace table t1 ( ) with system versioning; --replace_result "bigint unsigned" SYS_TRX_TYPE timestamp(6) SYS_TRX_TYPE ---error ER_MISMATCH +--error ER_VERS_PERIOD_COLUMNS eval create or replace table t1 ( x4 int unsigned, Sys_start $sys_datatype generated always as row start, @@ -58,7 +58,7 @@ eval create or replace table t1 ( ) with system versioning; --replace_result "bigint unsigned" SYS_TRX_TYPE timestamp(6) SYS_TRX_TYPE ---error ER_MISMATCH +--error ER_VERS_PERIOD_COLUMNS eval create or replace table t1 ( x5 int unsigned, Sys_start $sys_datatype generated always as row start, @@ -84,7 +84,7 @@ eval create or replace table t1 ( ); --replace_result "bigint unsigned" SYS_TRX_TYPE timestamp(6) SYS_TRX_TYPE ---error ER_MISMATCH +--error ER_VERS_PERIOD_COLUMNS eval create or replace table t1 ( x8 int unsigned, Sys_start $sys_datatype generated always as row start, diff --git a/sql/handler.cc b/sql/handler.cc index 1f46e14e173..3b936362d4b 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -6900,8 +6900,7 @@ bool Vers_parse_info::check_and_fix_implicit( vers_cols == 0 && (plain_cols == 0 || !table_with_system_versioning)) { - my_error(ER_VERS_NO_COLS_DEFINED, MYF(0), - table_name, "WITH SYSTEM VERSIONING"); + my_error(ER_VERS_NO_COLS_DEFINED, MYF(0), table_name); return true; } @@ -7202,17 +7201,9 @@ bool Vers_parse_info::check_with_conditions(const char *table_name) const return true; } - if (as_row.start != system_time.start) + if (as_row.start != system_time.start || as_row.end != system_time.end) { - my_error(ER_MISMATCH, MYF(0), table_name, - "PERIOD FOR SYSTEM_TIME", "AS ROW START"); - return true; - } - - if (as_row.end != system_time.end) - { - my_error(ER_MISMATCH, MYF(0), table_name, - "PERIOD FOR SYSTEM_TIME", "AS ROW END"); + my_error(ER_VERS_PERIOD_COLUMNS, MYF(0), as_row.start.str, as_row.end.str); return true; } diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index 2d1c5047664..7c34eacbc11 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -5752,8 +5752,8 @@ ER_MAX_PREPARED_STMT_COUNT_REACHED 42000 eng "Can't create more than max_prepared_stmt_count statements (current value: %lu)" ger "Kann nicht mehr Anweisungen als max_prepared_stmt_count erzeugen (aktueller Wert: %lu)" ER_VIEW_RECURSIVE - eng "`%-.192s`.`%-.192s` contains view recursion" - ger "`%-.192s`.`%-.192s` enthält View-Rekursion" + eng "%`s.%`s contains view recursion" + ger "%`s.%`s enthält View-Rekursion" ER_NON_GROUPING_FIELD_USED 42000 eng "Non-grouping field '%-.192s' is used in %-.64s clause" ger "In der %-.192s-Klausel wird das die Nicht-Gruppierungsspalte '%-.64s' verwendet" @@ -6249,37 +6249,37 @@ ER_BINLOG_LOGGING_IMPOSSIBLE eng "Binary logging not possible. Message: %s" ger "Binärlogging nicht möglich. Meldung: %s" ER_VIEW_NO_CREATION_CTX - eng "View `%-.64s`.`%-.64s` has no creation context" - ger "View `%-.64s`.`%-.64s` hat keinen Erzeugungskontext" + eng "View %`s.%`s has no creation context" + ger "View %`s.%`s hat keinen Erzeugungskontext" ER_VIEW_INVALID_CREATION_CTX - eng "Creation context of view `%-.64s`.`%-.64s' is invalid" - ger "Erzeugungskontext des Views`%-.64s`.`%-.64s' ist ungültig" + eng "Creation context of view %`s.%`s is invalid" + ger "Erzeugungskontext des Views%`s.%`s ist ungültig" ER_SR_INVALID_CREATION_CTX - eng "Creation context of stored routine `%-.64s`.`%-.64s` is invalid" - ger "Erzeugungskontext der gespeicherten Routine`%-.64s`.`%-.64s` ist ungültig" + eng "Creation context of stored routine %`s.%`s is invalid" + ger "Erzeugungskontext der gespeicherten Routine%`s.%`s ist ungültig" ER_TRG_CORRUPTED_FILE - eng "Corrupted TRG file for table `%-.64s`.`%-.64s`" - ger "Beschädigte TRG-Datei für Tabelle `%-.64s`.`%-.64s`" + eng "Corrupted TRG file for table %`s.%`s" + ger "Beschädigte TRG-Datei für Tabelle %`s.%`s" ER_TRG_NO_CREATION_CTX - eng "Triggers for table `%-.64s`.`%-.64s` have no creation context" - ger "Trigger für Tabelle `%-.64s`.`%-.64s` haben keinen Erzeugungskontext" + eng "Triggers for table %`s.%`s have no creation context" + ger "Trigger für Tabelle %`s.%`s haben keinen Erzeugungskontext" ER_TRG_INVALID_CREATION_CTX - eng "Trigger creation context of table `%-.64s`.`%-.64s` is invalid" - ger "Trigger-Erzeugungskontext der Tabelle `%-.64s`.`%-.64s` ist ungültig" + eng "Trigger creation context of table %`s.%`s is invalid" + ger "Trigger-Erzeugungskontext der Tabelle %`s.%`s ist ungültig" ER_EVENT_INVALID_CREATION_CTX - eng "Creation context of event `%-.64s`.`%-.64s` is invalid" - ger "Erzeugungskontext des Events `%-.64s`.`%-.64s` ist ungültig" + eng "Creation context of event %`s.%`s is invalid" + ger "Erzeugungskontext des Events %`s.%`s ist ungültig" ER_TRG_CANT_OPEN_TABLE - eng "Cannot open table for trigger `%-.64s`.`%-.64s`" - ger "Kann Tabelle für den Trigger `%-.64s`.`%-.64s` nicht öffnen" + eng "Cannot open table for trigger %`s.%`s" + ger "Kann Tabelle für den Trigger %`s.%`s nicht öffnen" ER_CANT_CREATE_SROUTINE - eng "Cannot create stored routine `%-.64s`. Check warnings" - ger "Kann gespeicherte Routine `%-.64s` nicht erzeugen. Beachten Sie die Warnungen" + eng "Cannot create stored routine %`s. Check warnings" + ger "Kann gespeicherte Routine %`s nicht erzeugen. Beachten Sie die Warnungen" ER_UNUSED_11 eng "You should never see it" ER_NO_FORMAT_DESCRIPTION_EVENT_BEFORE_BINLOG_STATEMENT - eng "The BINLOG statement of type `%s` was not preceded by a format description BINLOG statement" - ger "Der BINLOG-Anweisung vom Typ `%s` ging keine BINLOG-Anweisung zur Formatbeschreibung voran" + eng "The BINLOG statement of type %s was not preceded by a format description BINLOG statement" + ger "Der BINLOG-Anweisung vom Typ %s ging keine BINLOG-Anweisung zur Formatbeschreibung voran" ER_SLAVE_CORRUPT_EVENT eng "Corrupted replication event was detected" ger "Beschädigtes Replikationsereignis entdeckt" @@ -6596,7 +6596,7 @@ ER_MULTI_UPDATE_KEY_CONFLICT # When translating this error message make sure to include "ALTER TABLE" in the # message as mysqlcheck parses the error message looking for ALTER TABLE. ER_TABLE_NEEDS_REBUILD - eng "Table rebuild required. Please do \"ALTER TABLE `%-.32s` FORCE\" or dump/reload to fix it!" + eng "Table rebuild required. Please do \"ALTER TABLE %`s FORCE\" or dump/reload to fix it!" WARN_OPTION_BELOW_LIMIT eng "The value of '%s' should be no less than the value of '%s'" @@ -7813,7 +7813,7 @@ ER_UPDATE_INFO_WITH_SYSTEM_VERSIONING eng "Rows matched: %ld Changed: %ld Inserted: %ld Warnings: %ld" ER_VERS_FIELD_WRONG_TYPE - eng "%`s must be of type %`s for versioned table %`s" + eng "%`s must be of type %s for versioned table %`s" ER_VERS_ENGINE_UNSUPPORTED eng "Engine does not support System Versioning for %`s" @@ -7843,10 +7843,10 @@ WARN_VERS_PART_NON_HISTORICAL eng "Partition %`s contains non-historical data" ER_VERS_ALTER_NOT_ALLOWED - eng "Not allowed for versioned `%s.%s`. Change `versioning_alter_history` to proceed with ALTER." + eng "Not allowed for versioned %`s.%`s. Change `versioning_alter_history` to proceed with ALTER." ER_VERS_ALTER_ENGINE_PROHIBITED - eng "Not allowed for versioned `%s.%s`. Change to/from native versioning engine is prohibited." + eng "Not allowed for versioned %`s.%`s. Change to/from native versioning engine is prohibited." ER_VERS_RANGE_PROHIBITED eng "SYSTEM_TIME range selector is prohibited" @@ -7861,28 +7861,25 @@ ER_VERS_UNUSED_CLAUSE eng "Unused clause: '%s'" WARN_VERS_ALIAS_TOO_LONG - eng "Auto generated alias for `%s.%s` is too long; using `%s`" + eng "Auto generated alias for %`s.%`s is too long; using %`s" ER_VERS_VTMD_ERROR eng "VTMD error: %s" -ER_NOT_ALLOWED - eng "for %`s: not allowed '%s'" - ER_VERS_DIFFERENT_TABLES eng "Wrong parameters for %`s: system fields selected from different tables" ER_VERS_NO_COLS_DEFINED - eng "Wrong parameters for %`s: no columns defined '%s'" + eng "Table %`s has no versioned columns" ER_VERS_NOT_VERSIONED - eng "Wrong parameters for %`s: table is not versioned" + eng "Table %`s is not versioned" ER_MISSING eng "Wrong parameters for %`s: missing '%s'" -ER_MISMATCH - eng "Wrong parameters for %`s: mismatch '%s' and '%s'" +ER_VERS_PERIOD_COLUMNS + eng "PERIOD FOR SYSTEM_TIME must use columns %`s and %`s" ER_PART_WRONG_VALUE eng "Wrong parameters for partitioned %`s: wrong value for '%s'" @@ -7897,19 +7894,20 @@ ER_VERS_NO_TRX_ID eng "TRX_ID %lu not found in `mysql.transaction_registry`" ER_WRONG_TABLESPACE_NAME 42000 - eng "Incorrect tablespace name `%-.192s`" + eng "Incorrect tablespace name %`s" ER_VERS_ALTER_SYSTEM_FIELD - eng "Can not change system versioning field '%s'" + eng "Can not change system versioning field %`s" ER_VERS_SYS_FIELD_NOT_HIDDEN - eng "System versioning field '%s' is not hidden" + eng "System versioning field %`s is not hidden" ER_NOT_LOG_TABLE - eng "Table `%s.%s` is not a log table" + eng "Table %`s.%`s is not a log table" ER_VERS_GENERATED_ALWAYS_NOT_EMPTY - eng "Can not modify column `%s` to GENERATED ALWAYS AS ROW START/END for non-empty table" + eng "Can not modify column %`s to GENERATED ALWAYS AS ROW START/END for non-empty table" ER_VERS_TRT_IS_DISABLED eng "Some versioned DML requires `transaction_registry` to be set to ON." +