diff options
Diffstat (limited to 'mysql-test/suite/sql_sequence')
| -rw-r--r-- | mysql-test/suite/sql_sequence/create.result | 17 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/create.test | 6 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/default.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/other.result | 13 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/other.test | 10 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/rebuild.result | 147 | ||||
| -rw-r--r-- | mysql-test/suite/sql_sequence/rebuild.test | 2 |
7 files changed, 24 insertions, 175 deletions
diff --git a/mysql-test/suite/sql_sequence/create.result b/mysql-test/suite/sql_sequence/create.result index 073cb1ac390..c32fc4042f4 100644 --- a/mysql-test/suite/sql_sequence/create.result +++ b/mysql-test/suite/sql_sequence/create.result @@ -165,7 +165,7 @@ drop sequence t1; ERROR 42S02: 'test.t1' is not a SEQUENCE drop sequence if exists t1; Warnings: -Note 4091 Unknown SEQUENCE: 'test.t1' +Note 4090 'test.t1' is not a SEQUENCE create sequence t1 start with 10 maxvalue=9; ERROR HY000: Sequence 'test.t1' has out of range value for options create sequence t1 minvalue= 100 maxvalue=10; @@ -421,12 +421,11 @@ CREATE SEQUENCE s1; drop sequence s1; drop sequence if exists t1,t2,t3,t4; Warnings: -Note 4091 Unknown SEQUENCE: 'test.t3' +Note 4090 'test.t3' is not a SEQUENCE Note 4091 Unknown SEQUENCE: 'test.t4' drop table if exists t1,t2,t3; Warnings: -Note 1051 Unknown table 'test.t1' -Note 1051 Unknown table 'test.t2' +Note 1051 Unknown table 'test.t1,test.t2' CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); CREATE SEQUENCE s1; @@ -441,15 +440,15 @@ CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); CREATE SEQUENCE s1; drop sequence t1,t2,s1,s2; -ERROR 42S02: Unknown SEQUENCE: 'test.t1,test.t2,test.s2' +ERROR 42S02: 'test.t1' is not a SEQUENCE drop table if exists t1,t2; CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); CREATE SEQUENCE s1; drop sequence if exists t1,t2,s1,s2; Warnings: -Note 4091 Unknown SEQUENCE: 'test.t1' -Note 4091 Unknown SEQUENCE: 'test.t2' +Note 4090 'test.t1' is not a SEQUENCE +Note 4090 'test.t2' is not a SEQUENCE Note 4091 Unknown SEQUENCE: 'test.s2' drop table if exists t1,t2; CREATE TEMPORARY SEQUENCE s1; @@ -666,7 +665,7 @@ create temporary sequence s; drop temporary table s; create temporary table s (i int); drop temporary sequence s; -ERROR 42S02: 'test.s' is not a SEQUENCE +ERROR 42S02: Unknown SEQUENCE: 'test.s' drop table s; # # MDEV-15115 Assertion failure in CREATE SEQUENCE...ROW_FORMAT=REDUNDANT @@ -704,7 +703,7 @@ ERROR HY000: Sequence 'test.seq1' has out of range value for options # Task 4: CREATE TEMPORARY TABLE s1 (s1 INT); DROP TEMPORARY SEQUENCE s1; -ERROR 42S02: 'test.s1' is not a SEQUENCE +ERROR 42S02: Unknown SEQUENCE: 'test.s1' DROP TEMPORARY TABLE s1; # Task 5: CREATE TEMPORARY TABLE s1 (s1 INT); diff --git a/mysql-test/suite/sql_sequence/create.test b/mysql-test/suite/sql_sequence/create.test index aa58b0c5fec..49b39fbb40c 100644 --- a/mysql-test/suite/sql_sequence/create.test +++ b/mysql-test/suite/sql_sequence/create.test @@ -342,7 +342,7 @@ drop table if exists t1,t2,s1,s2; CREATE TABLE t1 (a int); CREATE TABLE t2 (a int); CREATE SEQUENCE s1; ---error ER_UNKNOWN_SEQUENCES +--error ER_NOT_SEQUENCE2 drop sequence t1,t2,s1,s2; drop table if exists t1,t2; @@ -489,7 +489,7 @@ drop table s; create temporary sequence s; drop temporary table s; create temporary table s (i int); ---error ER_NOT_SEQUENCE2 +--error ER_UNKNOWN_SEQUENCES drop temporary sequence s; drop table s; @@ -536,7 +536,7 @@ CREATE SEQUENCE seq1 START WITH 1 cache -1; --echo # Task 4: CREATE TEMPORARY TABLE s1 (s1 INT); ---error ER_NOT_SEQUENCE2 +--error ER_UNKNOWN_SEQUENCES DROP TEMPORARY SEQUENCE s1; DROP TEMPORARY TABLE s1; diff --git a/mysql-test/suite/sql_sequence/default.result b/mysql-test/suite/sql_sequence/default.result index abed796cb75..eecef1d3527 100644 --- a/mysql-test/suite/sql_sequence/default.result +++ b/mysql-test/suite/sql_sequence/default.result @@ -1,8 +1,6 @@ drop table if exists t1,s1,s2; Warnings: -Note 1051 Unknown table 'test.t1' -Note 1051 Unknown table 'test.s1' -Note 1051 Unknown table 'test.s2' +Note 1051 Unknown table 'test.t1,test.s1,test.s2' drop view if exists v1; Warnings: Note 4092 Unknown VIEW: 'test.v1' diff --git a/mysql-test/suite/sql_sequence/other.result b/mysql-test/suite/sql_sequence/other.result index 8ac766702d3..d237be635f7 100644 --- a/mysql-test/suite/sql_sequence/other.result +++ b/mysql-test/suite/sql_sequence/other.result @@ -310,9 +310,9 @@ CREATE TABLE t1 (a INT); CREATE TEMPORARY TABLE tmp (b INT); LOCK TABLE t1 READ; DROP SEQUENCE tmp; -ERROR 42S02: 'test.tmp' is not a SEQUENCE +ERROR 42S02: Unknown SEQUENCE: 'test.tmp' DROP TEMPORARY SEQUENCE tmp; -ERROR 42S02: 'test.tmp' is not a SEQUENCE +ERROR 42S02: Unknown SEQUENCE: 'test.tmp' DROP SEQUENCE t1; ERROR HY000: Table 't1' was locked with a READ lock and can't be updated DROP TEMPORARY SEQUENCE t1; @@ -324,19 +324,17 @@ DROP TEMPORARY SEQUENCE t1; ERROR 42S02: Unknown SEQUENCE: 'test.t1' DROP TABLE t1; CREATE TABLE t (a INT); -CREATE TEMPORARY TABLE s (f INT); CREATE SEQUENCE s; LOCK TABLE t WRITE; DROP SEQUENCE s; -ERROR 42S02: 'test.s' is not a SEQUENCE +ERROR HY000: Table 's' was not locked with LOCK TABLES DROP TEMPORARY SEQUENCE s; -ERROR 42S02: 'test.s' is not a SEQUENCE +ERROR 42S02: Unknown SEQUENCE: 'test.s' UNLOCK TABLES; CREATE TEMPORARY SEQUENCE s; LOCK TABLE t WRITE; DROP TEMPORARY SEQUENCE s; UNLOCK TABLES; -DROP TEMPORARY TABLE s; DROP SEQUENCE s; create table s(a INT); CREATE TEMPORARY TABLE s (f INT); @@ -352,9 +350,10 @@ CREATE VIEW v1 as SELECT * FROM t; CREATE SEQUENCE s; DROP SEQUENCE IF EXISTS v1; Warnings: -Note 4091 Unknown SEQUENCE: 'test.v1' +Note 1965 'test.v1' is a view DROP VIEW IF EXISTS s; Warnings: +Warning 1347 'test.s' is not of type 'VIEW' Note 4092 Unknown VIEW: 'test.s' DROP VIEW v1; DROP SEQUENCE s; diff --git a/mysql-test/suite/sql_sequence/other.test b/mysql-test/suite/sql_sequence/other.test index 0fbb2d0e2f9..639cc5c36b0 100644 --- a/mysql-test/suite/sql_sequence/other.test +++ b/mysql-test/suite/sql_sequence/other.test @@ -325,9 +325,9 @@ drop sequence s1; CREATE TABLE t1 (a INT); CREATE TEMPORARY TABLE tmp (b INT); LOCK TABLE t1 READ; ---error ER_NOT_SEQUENCE2 +--error ER_UNKNOWN_SEQUENCES DROP SEQUENCE tmp; ---error ER_NOT_SEQUENCE2 +--error ER_UNKNOWN_SEQUENCES DROP TEMPORARY SEQUENCE tmp; --error ER_TABLE_NOT_LOCKED_FOR_WRITE DROP SEQUENCE t1; @@ -344,19 +344,17 @@ DROP TABLE t1; CREATE TABLE t (a INT); -CREATE TEMPORARY TABLE s (f INT); CREATE SEQUENCE s; LOCK TABLE t WRITE; ---error ER_NOT_SEQUENCE2 +--error ER_TABLE_NOT_LOCKED DROP SEQUENCE s; ---error ER_NOT_SEQUENCE2 +--error ER_UNKNOWN_SEQUENCES DROP TEMPORARY SEQUENCE s; UNLOCK TABLES; CREATE TEMPORARY SEQUENCE s; LOCK TABLE t WRITE; DROP TEMPORARY SEQUENCE s; UNLOCK TABLES; -DROP TEMPORARY TABLE s; DROP SEQUENCE s; create table s(a INT); diff --git a/mysql-test/suite/sql_sequence/rebuild.result b/mysql-test/suite/sql_sequence/rebuild.result index 80ac6fa34f3..6348d1775ab 100644 --- a/mysql-test/suite/sql_sequence/rebuild.result +++ b/mysql-test/suite/sql_sequence/rebuild.result @@ -5,159 +5,14 @@ CREATE SEQUENCE s1 ENGINE=InnoDB; ALTER TABLE s1 FORCE; CREATE TABLE t1 (a INT) ENGINE=MyISAM; CREATE TABLE t2 (b VARCHAR(64)) ENGINE=MyISAM; -CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS; +CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA='test'; INSERT INTO t1 VALUES (1); select * from t1; a 1 select * from t2; b -ALL_PLUGINS -APPLICABLE_ROLES -CHARACTER_SETS -CHECK_CONSTRAINTS -CLIENT_STATISTICS -COLLATIONS -COLLATION_CHARACTER_SET_APPLICABILITY -COLUMNS -COLUMN_PRIVILEGES -ENABLED_ROLES -ENGINES -EVENTS -FILES -GEOMETRY_COLUMNS -GLOBAL_STATUS -GLOBAL_VARIABLES -INDEX_STATISTICS -INNODB_BUFFER_PAGE -INNODB_BUFFER_PAGE_LRU -INNODB_BUFFER_POOL_STATS -INNODB_CMPMEM -INNODB_CMP_PER_INDEX -INNODB_LOCKS -INNODB_LOCK_WAITS -INNODB_METRICS -INNODB_SYS_COLUMNS -INNODB_SYS_FIELDS -INNODB_SYS_FOREIGN -INNODB_SYS_FOREIGN_COLS -INNODB_SYS_INDEXES -INNODB_SYS_TABLES -INNODB_SYS_VIRTUAL -INNODB_TRX -KEYWORDS -KEY_CACHES -KEY_COLUMN_USAGE -OPTIMIZER_TRACE -PARAMETERS -PARTITIONS -PLUGINS -PROCESSLIST -PROFILING -REFERENTIAL_CONSTRAINTS -ROUTINES -SCHEMATA -SCHEMA_PRIVILEGES -SESSION_STATUS -SESSION_VARIABLES -SPATIAL_REF_SYS -SQL_FUNCTIONS -STATISTICS -SYSTEM_VARIABLES -TABLES -TABLESPACES -TABLE_CONSTRAINTS -TABLE_PRIVILEGES -TABLE_STATISTICS -TRIGGERS -USER_PRIVILEGES -USER_STATISTICS -VIEWS -accounts -column_stats -columns_priv -cond_instances -db -event -events_stages_current -events_stages_history -events_stages_history_long -events_stages_summary_by_account_by_event_name -events_stages_summary_by_host_by_event_name -events_stages_summary_by_thread_by_event_name -events_stages_summary_by_user_by_event_name -events_stages_summary_global_by_event_name -events_statements_current -events_statements_history -events_statements_history_long -events_statements_summary_by_account_by_event_name -events_statements_summary_by_digest -events_statements_summary_by_host_by_event_name -events_statements_summary_by_thread_by_event_name -events_statements_summary_by_user_by_event_name -events_statements_summary_global_by_event_name -events_waits_current -events_waits_history -events_waits_history_long -events_waits_summary_by_account_by_event_name -events_waits_summary_by_host_by_event_name -events_waits_summary_by_instance -events_waits_summary_by_thread_by_event_name -events_waits_summary_by_user_by_event_name -events_waits_summary_global_by_event_name -file_instances -file_summary_by_event_name -file_summary_by_instance -func -general_log -global_priv -global_suppressions -gtid_slave_pos -help_category -help_keyword -help_relation -help_topic -host_cache -hosts -index_stats -innodb_index_stats -innodb_table_stats -mutex_instances -objects_summary_global_by_type -performance_timers -plugin -proc -procs_priv -proxies_priv -roles_mapping -rwlock_instances s1 -servers -session_account_connect_attrs -session_connect_attrs -setup_actors -setup_consumers -setup_instruments -setup_objects -setup_timers -slow_log -socket_instances -socket_summary_by_event_name -socket_summary_by_instance t1 t2 -table_io_waits_summary_by_index_usage -table_io_waits_summary_by_table -table_lock_waits_summary_by_table -table_stats -tables_priv -test_suppressions -threads -time_zone -time_zone_leap_second -time_zone_name -time_zone_transition -time_zone_transition_type -transaction_registry -users DROP TABLE t1, t2, s1; diff --git a/mysql-test/suite/sql_sequence/rebuild.test b/mysql-test/suite/sql_sequence/rebuild.test index 2994b90c98f..ae8a06671a3 100644 --- a/mysql-test/suite/sql_sequence/rebuild.test +++ b/mysql-test/suite/sql_sequence/rebuild.test @@ -9,7 +9,7 @@ CREATE SEQUENCE s1 ENGINE=InnoDB; ALTER TABLE s1 FORCE; CREATE TABLE t1 (a INT) ENGINE=MyISAM; CREATE TABLE t2 (b VARCHAR(64)) ENGINE=MyISAM; -CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS; +CREATE TRIGGER tr1 BEFORE INSERT ON t1 FOR EACH ROW INSERT INTO t2 SELECT TABLE_NAME FROM INFORMATION_SCHEMA.PARTITIONS WHERE TABLE_SCHEMA='test'; INSERT INTO t1 VALUES (1); --sorted_result select * from t1; |