From 2aa5d667570c2e68e4ab0e771582706e15642403 Mon Sep 17 00:00:00 2001 From: obdev Date: Thu, 27 Oct 2022 08:37:26 +0000 Subject: [PATCH] delete Delete an exception case --- .../mysql_test/include/check_schema_sync.inc | 22 -- .../mysql_test/include/not_embedded.inc | 5 - .../deploy/mysql_test/r/not_embedded.require | 2 - .../r/mysql/information_schema-big.result | 293 ------------------ .../t/information_schema-big.test | 155 --------- 5 files changed, 477 deletions(-) delete mode 100644 tools/deploy/mysql_test/include/check_schema_sync.inc delete mode 100644 tools/deploy/mysql_test/include/not_embedded.inc delete mode 100644 tools/deploy/mysql_test/r/not_embedded.require delete mode 100644 tools/deploy/mysql_test/test_suite/information_schema/r/mysql/information_schema-big.result delete mode 100644 tools/deploy/mysql_test/test_suite/information_schema/t/information_schema-big.test diff --git a/tools/deploy/mysql_test/include/check_schema_sync.inc b/tools/deploy/mysql_test/include/check_schema_sync.inc deleted file mode 100644 index 433f676ff..000000000 --- a/tools/deploy/mysql_test/include/check_schema_sync.inc +++ /dev/null @@ -1,22 +0,0 @@ - -connect (ob_sys_check_schema,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT); -connection ob_sys_check_schema; - -let $i = 10; -while($i > 0) -{ - sleep 1; - let $cnt = query_get_value(select count(*) as cnt from oceanbase.__all_virtual_server_schema_info as a join oceanbase.__all_virtual_server_schema_info as b on a.tenant_id = b.tenant_id where a.refreshed_schema_version != b.refreshed_schema_version, cnt, 1); - dec $i; - if ($cnt == 0) - { - let $i = -4; - } -} - -if ($i != -4) -{ - --echo check schema sync timeout - eval select * from oceanbase.__all_virtual_server_schema_info; -} -disconnect ob_sys_check_schema; diff --git a/tools/deploy/mysql_test/include/not_embedded.inc b/tools/deploy/mysql_test/include/not_embedded.inc deleted file mode 100644 index 7bc9b9551..000000000 --- a/tools/deploy/mysql_test/include/not_embedded.inc +++ /dev/null @@ -1,5 +0,0 @@ --- require mysql_test/r/not_embedded.require -disable_query_log; -select version() like '%embedded%' as 'have_embedded'; -enable_query_log; - diff --git a/tools/deploy/mysql_test/r/not_embedded.require b/tools/deploy/mysql_test/r/not_embedded.require deleted file mode 100644 index b2ea98bcd..000000000 --- a/tools/deploy/mysql_test/r/not_embedded.require +++ /dev/null @@ -1,2 +0,0 @@ -have_embedded -0 diff --git a/tools/deploy/mysql_test/test_suite/information_schema/r/mysql/information_schema-big.result b/tools/deploy/mysql_test/test_suite/information_schema/r/mysql/information_schema-big.result deleted file mode 100644 index 7aea7d235..000000000 --- a/tools/deploy/mysql_test/test_suite/information_schema/r/mysql/information_schema-big.result +++ /dev/null @@ -1,293 +0,0 @@ -create user testtt1 identified by 'testtt1'; -create database tt1_test; -GRANT ALL ON *.* TO testtt1; -use test; -DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5; -DROP VIEW IF EXISTS v1; -# -# Bug#18925: subqueries with MIN/MAX functions on INFORMARTION_SCHEMA -# -SELECT t.table_name, c1.column_name -FROM information_schema.tables t -INNER JOIN -information_schema.columns c1 -ON t.table_schema = c1.table_schema AND -t.table_name = c1.table_name -WHERE t.table_schema = 'information_schema' AND -c1.ordinal_position = -( SELECT COALESCE(MIN(c2.ordinal_position),1) -FROM information_schema.columns c2 -WHERE c2.table_schema = t.table_schema AND -c2.table_name = t.table_name AND -c2.column_name LIKE '%SCHEMA%') -AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -table_name column_name -CHARACTER_SETS CHARACTER_SET_NAME -CHECK_CONSTRAINTS CONSTRAINT_SCHEMA -COLLATIONS COLLATION_NAME -COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME -COLUMNS TABLE_SCHEMA -COLUMN_PRIVILEGES TABLE_SCHEMA -CONNECTION_CONTROL_FAILED_LOGIN_ATTEMPTS USERHOST -ENGINES ENGINE -FILES TABLE_SCHEMA -GLOBAL_STATUS VARIABLE_NAME -GLOBAL_VARIABLES VARIABLE_NAME -KEY_COLUMN_USAGE CONSTRAINT_SCHEMA -PARAMETERS SPECIFIC_SCHEMA -PARTITIONS TABLE_SCHEMA -PROCESSLIST ID -QUERY_RESPONSE_TIME RESPONSE_TIME -REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA -ROUTINES ROUTINE_SCHEMA -SCHEMATA SCHEMA_NAME -SCHEMA_PRIVILEGES TABLE_SCHEMA -SESSION_STATUS VARIABLE_NAME -SESSION_VARIABLES VARIABLE_NAME -STATISTICS TABLE_SCHEMA -TABLES TABLE_SCHEMA -TABLE_CONSTRAINTS CONSTRAINT_SCHEMA -TABLE_PRIVILEGES TABLE_SCHEMA -TRIGGERS TRIGGER_SCHEMA -USER_PRIVILEGES GRANTEE -VIEWS TABLE_SCHEMA -VIEW_TABLE_USAGE VIEW_SCHEMA -SELECT t.table_name, c1.column_name -FROM information_schema.tables t -INNER JOIN -information_schema.columns c1 -ON t.table_schema = c1.table_schema AND -t.table_name = c1.table_name -WHERE t.table_schema = 'information_schema' AND -c1.ordinal_position = -( SELECT COALESCE(MIN(c2.ordinal_position),1) -FROM information_schema.columns c2 -WHERE c2.table_schema = 'information_schema' AND -c2.table_name = t.table_name AND -c2.column_name LIKE '%SCHEMA%') -AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -table_name column_name -CHARACTER_SETS CHARACTER_SET_NAME -CHECK_CONSTRAINTS CONSTRAINT_SCHEMA -COLLATIONS COLLATION_NAME -COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME -COLUMNS TABLE_SCHEMA -COLUMN_PRIVILEGES TABLE_SCHEMA -CONNECTION_CONTROL_FAILED_LOGIN_ATTEMPTS USERHOST -ENGINES ENGINE -FILES TABLE_SCHEMA -GLOBAL_STATUS VARIABLE_NAME -GLOBAL_VARIABLES VARIABLE_NAME -KEY_COLUMN_USAGE CONSTRAINT_SCHEMA -PARAMETERS SPECIFIC_SCHEMA -PARTITIONS TABLE_SCHEMA -PROCESSLIST ID -QUERY_RESPONSE_TIME RESPONSE_TIME -REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA -ROUTINES ROUTINE_SCHEMA -SCHEMATA SCHEMA_NAME -SCHEMA_PRIVILEGES TABLE_SCHEMA -SESSION_STATUS VARIABLE_NAME -SESSION_VARIABLES VARIABLE_NAME -STATISTICS TABLE_SCHEMA -TABLES TABLE_SCHEMA -TABLE_CONSTRAINTS CONSTRAINT_SCHEMA -TABLE_PRIVILEGES TABLE_SCHEMA -TRIGGERS TRIGGER_SCHEMA -USER_PRIVILEGES GRANTEE -VIEWS TABLE_SCHEMA -VIEW_TABLE_USAGE VIEW_SCHEMA -SELECT t.table_name, c1.column_name -FROM information_schema.tables t -INNER JOIN -information_schema.columns c1 -ON t.table_schema = c1.table_schema AND -t.table_name = c1.table_name -WHERE t.table_schema = 'information_schema' AND -c1.ordinal_position = -( SELECT COALESCE(MIN(c2.ordinal_position),1) -FROM information_schema.columns c2 -WHERE c2.table_schema = t.table_schema AND -c2.table_name = t.table_name AND -c2.column_name LIKE '%SCHEMA%') -AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -table_name column_name -CHARACTER_SETS CHARACTER_SET_NAME -CHECK_CONSTRAINTS CONSTRAINT_SCHEMA -COLLATIONS COLLATION_NAME -COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME -COLUMNS TABLE_SCHEMA -COLUMN_PRIVILEGES TABLE_SCHEMA -CONNECTION_CONTROL_FAILED_LOGIN_ATTEMPTS USERHOST -ENGINES ENGINE -FILES TABLE_SCHEMA -GLOBAL_STATUS VARIABLE_NAME -GLOBAL_VARIABLES VARIABLE_NAME -KEY_COLUMN_USAGE CONSTRAINT_SCHEMA -PARAMETERS SPECIFIC_SCHEMA -PARTITIONS TABLE_SCHEMA -PROCESSLIST ID -QUERY_RESPONSE_TIME RESPONSE_TIME -REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA -ROUTINES ROUTINE_SCHEMA -SCHEMATA SCHEMA_NAME -SCHEMA_PRIVILEGES TABLE_SCHEMA -SESSION_STATUS VARIABLE_NAME -SESSION_VARIABLES VARIABLE_NAME -STATISTICS TABLE_SCHEMA -TABLES TABLE_SCHEMA -TABLE_CONSTRAINTS CONSTRAINT_SCHEMA -TABLE_PRIVILEGES TABLE_SCHEMA -TRIGGERS TRIGGER_SCHEMA -USER_PRIVILEGES GRANTEE -VIEWS TABLE_SCHEMA -VIEW_TABLE_USAGE VIEW_SCHEMA -SELECT t.table_name, c1.column_name -FROM information_schema.tables t -INNER JOIN -information_schema.columns c1 -ON t.table_schema = c1.table_schema AND -t.table_name = c1.table_name -WHERE t.table_schema = 'information_schema' AND -c1.ordinal_position = -( SELECT COALESCE(MIN(c2.ordinal_position),1) -FROM information_schema.columns c2 -WHERE c2.table_schema = 'information_schema' AND -c2.table_name = t.table_name AND -c2.column_name LIKE '%SCHEMA%') -AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -table_name column_name -CHARACTER_SETS CHARACTER_SET_NAME -CHECK_CONSTRAINTS CONSTRAINT_SCHEMA -COLLATIONS COLLATION_NAME -COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME -COLUMNS TABLE_SCHEMA -COLUMN_PRIVILEGES TABLE_SCHEMA -CONNECTION_CONTROL_FAILED_LOGIN_ATTEMPTS USERHOST -ENGINES ENGINE -FILES TABLE_SCHEMA -GLOBAL_STATUS VARIABLE_NAME -GLOBAL_VARIABLES VARIABLE_NAME -KEY_COLUMN_USAGE CONSTRAINT_SCHEMA -PARAMETERS SPECIFIC_SCHEMA -PARTITIONS TABLE_SCHEMA -PROCESSLIST ID -QUERY_RESPONSE_TIME RESPONSE_TIME -REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA -ROUTINES ROUTINE_SCHEMA -SCHEMATA SCHEMA_NAME -SCHEMA_PRIVILEGES TABLE_SCHEMA -SESSION_STATUS VARIABLE_NAME -SESSION_VARIABLES VARIABLE_NAME -STATISTICS TABLE_SCHEMA -TABLES TABLE_SCHEMA -TABLE_CONSTRAINTS CONSTRAINT_SCHEMA -TABLE_PRIVILEGES TABLE_SCHEMA -TRIGGERS TRIGGER_SCHEMA -USER_PRIVILEGES GRANTEE -VIEWS TABLE_SCHEMA -VIEW_TABLE_USAGE VIEW_SCHEMA -select 1; -1 -1 -use test; -create table if not exists t1(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -create table if not exists t2(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -create table if not exists t3(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -create table if not exists t4(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -SELECT t.table_name, c1.column_name -FROM information_schema.tables t -INNER JOIN -information_schema.columns c1 -ON t.table_schema = c1.table_schema AND -t.table_name = c1.table_name -WHERE t.table_schema = 'information_schema' AND -c1.ordinal_position = -( SELECT COALESCE(MIN(c2.ordinal_position),1) -FROM information_schema.columns c2 -WHERE c2.table_schema = t.table_schema AND -c2.table_name = t.table_name AND -c2.column_name LIKE '%SCHEMA%') -AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -table_name column_name -SESSION_VARIABLES VARIABLE_NAME -TABLE_PRIVILEGES TABLE_SCHEMA -USER_PRIVILEGES GRANTEE -SCHEMA_PRIVILEGES TABLE_SCHEMA -TABLE_CONSTRAINTS CONSTRAINT_SCHEMA -GLOBAL_STATUS VARIABLE_NAME -PARTITIONS TABLE_SCHEMA -SESSION_STATUS VARIABLE_NAME -PARAMETERS SPECIFIC_SCHEMA -REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA -TRIGGERS TRIGGER_SCHEMA -CHECK_CONSTRAINTS CONSTRAINT_SCHEMA -SCHEMATA SCHEMA_NAME -CHARACTER_SETS CHARACTER_SET_NAME -GLOBAL_VARIABLES VARIABLE_NAME -STATISTICS TABLE_SCHEMA -VIEWS TABLE_SCHEMA -TABLES TABLE_SCHEMA -COLLATIONS COLLATION_NAME -COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME -PROCESSLIST ID -KEY_COLUMN_USAGE CONSTRAINT_SCHEMA -ENGINES ENGINE -ROUTINES ROUTINE_SCHEMA -COLUMNS TABLE_SCHEMA -CONNECTION_CONTROL_FAILED_LOGIN_ATTEMPTS USERHOST -COLUMN_PRIVILEGES TABLE_SCHEMA -VIEW_TABLE_USAGE VIEW_SCHEMA -FILES TABLE_SCHEMA -QUERY_RESPONSE_TIME RESPONSE_TIME -SELECT t.table_name, c1.column_name -FROM information_schema.tables t -INNER JOIN -information_schema.columns c1 -ON t.table_schema = c1.table_schema AND -t.table_name = c1.table_name -WHERE t.table_schema = 'information_schema' AND -c1.ordinal_position = -( SELECT COALESCE(MIN(c2.ordinal_position),1) -FROM information_schema.columns c2 -WHERE c2.table_schema = 'information_schema' AND -c2.table_name = t.table_name AND -c2.column_name LIKE '%SCHEMA%') -AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -table_name column_name -CHARACTER_SETS CHARACTER_SET_NAME -CHECK_CONSTRAINTS CONSTRAINT_SCHEMA -COLLATIONS COLLATION_NAME -COLLATION_CHARACTER_SET_APPLICABILITY COLLATION_NAME -COLUMNS TABLE_SCHEMA -COLUMN_PRIVILEGES TABLE_SCHEMA -CONNECTION_CONTROL_FAILED_LOGIN_ATTEMPTS USERHOST -ENGINES ENGINE -FILES TABLE_SCHEMA -GLOBAL_STATUS VARIABLE_NAME -GLOBAL_VARIABLES VARIABLE_NAME -KEY_COLUMN_USAGE CONSTRAINT_SCHEMA -PARAMETERS SPECIFIC_SCHEMA -PARTITIONS TABLE_SCHEMA -PROCESSLIST ID -QUERY_RESPONSE_TIME RESPONSE_TIME -REFERENTIAL_CONSTRAINTS CONSTRAINT_SCHEMA -ROUTINES ROUTINE_SCHEMA -SCHEMATA SCHEMA_NAME -SCHEMA_PRIVILEGES TABLE_SCHEMA -SESSION_STATUS VARIABLE_NAME -SESSION_VARIABLES VARIABLE_NAME -STATISTICS TABLE_SCHEMA -TABLES TABLE_SCHEMA -TABLE_CONSTRAINTS CONSTRAINT_SCHEMA -TABLE_PRIVILEGES TABLE_SCHEMA -TRIGGERS TRIGGER_SCHEMA -USER_PRIVILEGES GRANTEE -VIEWS TABLE_SCHEMA -VIEW_TABLE_USAGE VIEW_SCHEMA diff --git a/tools/deploy/mysql_test/test_suite/information_schema/t/information_schema-big.test b/tools/deploy/mysql_test/test_suite/information_schema/t/information_schema-big.test deleted file mode 100644 index 95297e647..000000000 --- a/tools/deploy/mysql_test/test_suite/information_schema/t/information_schema-big.test +++ /dev/null @@ -1,155 +0,0 @@ ---disable_query_log -set @@session.explicit_defaults_for_timestamp=off; ---enable_query_log -#owner: yanmu.ztl -#owner group:sql2 -#description:information_schema test -# This test uses grants, which can't get tested for embedded server -#-- source mysql_test/include/big_test.inc --- source mysql_test/include/not_embedded.inc - -# check that CSV engine was compiled in, as the result of the test depends -# on the presence of the log tables (which are CSV-based). -#--source mysql_test/include/have_csv.inc - -connect (obsys,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT); -connection obsys; - -create user testtt1 identified by 'testtt1'; -create database tt1_test; -GRANT ALL ON *.* TO testtt1; - ---source mysql_test/include/check_schema_sync.inc -connect (conn1,$OBMYSQL_MS0,testtt1@sys,testtt1,tt1_test,$OBMYSQL_PORT); -connection conn1; - ---disable_query_log -set @@session.ob_query_timeout = 30000000; ---enable_query_log -use test; -# ---disable_warnings -DROP TABLE IF EXISTS t0,t1,t2,t3,t4,t5; ---disable_warnings -DROP VIEW IF EXISTS v1; ---enable_warnings - - ---echo # ---echo # Bug#18925: subqueries with MIN/MAX functions on INFORMARTION_SCHEMA ---echo # ---sorted_result -SELECT t.table_name, c1.column_name - FROM information_schema.tables t - INNER JOIN - information_schema.columns c1 - ON t.table_schema = c1.table_schema AND - t.table_name = c1.table_name - WHERE t.table_schema = 'information_schema' AND - c1.ordinal_position = - ( SELECT COALESCE(MIN(c2.ordinal_position),1) - FROM information_schema.columns c2 - WHERE c2.table_schema = t.table_schema AND - c2.table_name = t.table_name AND - c2.column_name LIKE '%SCHEMA%') - AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; ---sorted_result -SELECT t.table_name, c1.column_name - FROM information_schema.tables t - INNER JOIN - information_schema.columns c1 - ON t.table_schema = c1.table_schema AND - t.table_name = c1.table_name - WHERE t.table_schema = 'information_schema' AND - c1.ordinal_position = - ( SELECT COALESCE(MIN(c2.ordinal_position),1) - FROM information_schema.columns c2 - WHERE c2.table_schema = 'information_schema' AND - c2.table_name = t.table_name AND - c2.column_name LIKE '%SCHEMA%') - AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; -connect (conn_root,$OBMYSQL_MS0,root@sys,,*NO-ONE*,$OBMYSQL_PORT); -connection conn_root; ---disable_query_log -set @@session.ob_query_timeout = 30000000; ---enable_query_log ---sorted_result -SELECT t.table_name, c1.column_name - FROM information_schema.tables t - INNER JOIN - information_schema.columns c1 - ON t.table_schema = c1.table_schema AND - t.table_name = c1.table_name - WHERE t.table_schema = 'information_schema' AND - c1.ordinal_position = - ( SELECT COALESCE(MIN(c2.ordinal_position),1) - FROM information_schema.columns c2 - WHERE c2.table_schema = t.table_schema AND - c2.table_name = t.table_name AND - c2.column_name LIKE '%SCHEMA%') - AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; ---sorted_result -SELECT t.table_name, c1.column_name - FROM information_schema.tables t - INNER JOIN - information_schema.columns c1 - ON t.table_schema = c1.table_schema AND - t.table_name = c1.table_name - WHERE t.table_schema = 'information_schema' AND - c1.ordinal_position = - ( SELECT COALESCE(MIN(c2.ordinal_position),1) - FROM information_schema.columns c2 - WHERE c2.table_schema = 'information_schema' AND - c2.table_name = t.table_name AND - c2.column_name LIKE '%SCHEMA%') - AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; - -select 1; -connection conn1; -use test; -create table if not exists t1(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -connection conn1; -create table if not exists t2(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -connection conn1; -create table if not exists t3(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -connection conn1; -create table if not exists t4(i1 int, v2 varchar(80), i3 char(20),i4 float, d4 datetime(6),i5 decimal(5,3), primary key(i1)); -connection conn1; ---disable_query_log -set @@session.ob_query_timeout = 30000000; ---enable_query_log -SELECT t.table_name, c1.column_name - FROM information_schema.tables t - INNER JOIN - information_schema.columns c1 - ON t.table_schema = c1.table_schema AND - t.table_name = c1.table_name - WHERE t.table_schema = 'information_schema' AND - c1.ordinal_position = - ( SELECT COALESCE(MIN(c2.ordinal_position),1) - FROM information_schema.columns c2 - WHERE c2.table_schema = t.table_schema AND - c2.table_name = t.table_name AND - c2.column_name LIKE '%SCHEMA%') - AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%'; ---sorted_result -SELECT t.table_name, c1.column_name - FROM information_schema.tables t - INNER JOIN - information_schema.columns c1 - ON t.table_schema = c1.table_schema AND - t.table_name = c1.table_name - WHERE t.table_schema = 'information_schema' AND - c1.ordinal_position = - ( SELECT COALESCE(MIN(c2.ordinal_position),1) - FROM information_schema.columns c2 - WHERE c2.table_schema = 'information_schema' AND - c2.table_name = t.table_name AND - c2.column_name LIKE '%SCHEMA%') - AND t.table_name NOT LIKE 'ndb%' -AND t.table_name NOT LIKE 'innodb%';