From 041e9de6f80faa459425121ac37b3052772b3949 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Fri, 30 Mar 2018 19:15:55 +0200 Subject: [PATCH] wording: don't prohibit --- mysql-test/suite/versioning/r/alter.result | 8 ++++---- mysql-test/suite/versioning/r/create.result | 2 +- mysql-test/suite/versioning/r/debug.result | 2 +- mysql-test/suite/versioning/r/partition.result | 2 +- sql/share/errmsg-utf8.txt | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result index 233966d72d5..a6f1bb38a76 100644 --- a/mysql-test/suite/versioning/r/alter.result +++ b/mysql-test/suite/versioning/r/alter.result @@ -20,7 +20,7 @@ t CREATE TABLE `t` ( alter table t add column y int; ERROR HY000: Not allowed for system-versioned `test`.`t`. Change @@system_versioning_alter_history to proceed with ALTER. alter table t engine innodb; -ERROR HY000: Not allowed for system-versioned `test`.`t`. Change to/from native system versioning engine is prohibited. +ERROR HY000: Not allowed for system-versioned `test`.`t`. Change to/from native system versioning engine is not supported. alter table t drop system versioning; show create table t; Table Create Table @@ -440,11 +440,11 @@ alter table t1 engine=myisam; # MDEV-14692 crash in MDL_context::upgrade_shared_lock() create or replace temporary table t (a int); alter table t change column if exists b c bigint unsigned generated always as row start; -ERROR HY000: System versioning prohibited for TEMPORARY tables +ERROR HY000: TEMPORARY tables do not support system versioning alter table t change column if exists b c bigint unsigned generated always as row end; -ERROR HY000: System versioning prohibited for TEMPORARY tables +ERROR HY000: TEMPORARY tables do not support system versioning alter table t add system versioning; -ERROR HY000: System versioning prohibited for TEMPORARY tables +ERROR HY000: TEMPORARY tables do not support system versioning drop table t; # MDEV-14744 trx_id-based and transaction-based mixup in assertion create or replace table t (c text) engine=innodb with system versioning; diff --git a/mysql-test/suite/versioning/r/create.result b/mysql-test/suite/versioning/r/create.result index 871ba3a928c..815eefaf82a 100644 --- a/mysql-test/suite/versioning/r/create.result +++ b/mysql-test/suite/versioning/r/create.result @@ -403,7 +403,7 @@ t3 CREATE TABLE `t3` ( ) ENGINE=NON_DEFAULT_ENGINE DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING ## Errors create or replace temporary table t (x28 int) with system versioning; -ERROR HY000: System versioning prohibited for TEMPORARY tables +ERROR HY000: TEMPORARY tables do not support system versioning create or replace table t1 ( x29 int unsigned, Sys_start0 timestamp(6) as row start invisible, diff --git a/mysql-test/suite/versioning/r/debug.result b/mysql-test/suite/versioning/r/debug.result index 406717f8b5d..72bd1f18a68 100644 --- a/mysql-test/suite/versioning/r/debug.result +++ b/mysql-test/suite/versioning/r/debug.result @@ -5,7 +5,7 @@ t1 CREATE TABLE `t1` ( `a` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 create temporary table tt1 (a int) with system versioning; -ERROR HY000: System versioning prohibited for TEMPORARY tables +ERROR HY000: TEMPORARY tables do not support system versioning set @old_dbug=@@global.debug_dbug; set global debug_dbug='+d,sysvers_force'; create table t2 (a int); diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result index d44ded30218..390d2e5271a 100644 --- a/mysql-test/suite/versioning/r/partition.result +++ b/mysql-test/suite/versioning/r/partition.result @@ -36,7 +36,7 @@ x # Engine change native <-> non-native versioning prohibited create or replace table t1 (i int) engine=DEFAULT_ENGINE with system versioning partition by hash(i); alter table t1 engine=NON_DEFAULT_ENGINE; -ERROR HY000: Not allowed for system-versioned `test`.`t1`. Change to/from native system versioning engine is prohibited. +ERROR HY000: Not allowed for system-versioned `test`.`t1`. Change to/from native system versioning engine is not supported. ## CREATE TABLE create or replace table t1 (x int) partition by system_time ( diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt index f82611acaba..c0b3a881b8c 100644 --- a/sql/share/errmsg-utf8.txt +++ b/sql/share/errmsg-utf8.txt @@ -7854,10 +7854,10 @@ ER_VERS_ALTER_NOT_ALLOWED eng "Not allowed for system-versioned %`s.%`s. Change @@system_versioning_alter_history to proceed with ALTER." ER_VERS_ALTER_ENGINE_PROHIBITED - eng "Not allowed for system-versioned %`s.%`s. Change to/from native system versioning engine is prohibited." + eng "Not allowed for system-versioned %`s.%`s. Change to/from native system versioning engine is not supported." ER_VERS_RANGE_PROHIBITED - eng "SYSTEM_TIME range selector is prohibited" + eng "SYSTEM_TIME range selector is not allowed" ER_UNUSED_26 eng "You should never see it" @@ -7905,7 +7905,7 @@ ER_UNUSED_24 eng "You should never see it" ER_VERS_TEMPORARY - eng "System versioning prohibited for TEMPORARY tables" + eng "TEMPORARY tables do not support system versioning" ER_VERS_NOT_SUPPORTED eng "%s is not supported for %s system-versioned tables"