Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(mtr):fix mtr funcs_1 and perfschema test result content mismatch #263

Merged
merged 2 commits into from
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions mysql-test/suite/funcs_1/r/innodb_func_view.result
Original file line number Diff line number Diff line change
Expand Up @@ -3774,7 +3774,7 @@ CAST(my_varbinary_1000 AS TIME) my_varbinary_1000 id
NULL NULL 1
NULL 2
00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 23
Warnings:
Expand Down Expand Up @@ -3812,7 +3812,7 @@ CAST(my_binary_30 AS TIME) my_binary_30 id
NULL NULL 1
00:00:00 2
00:00:00 <--------30 characters-------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
NULL -1 5
41:58:00 1 17:58 22
Warnings:
Expand Down Expand Up @@ -3850,7 +3850,7 @@ CAST(my_varchar_1000 AS TIME) my_varchar_1000 id
NULL NULL 1
NULL 2
00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 21
Warnings:
Expand Down Expand Up @@ -3886,7 +3886,7 @@ CAST(my_char_30 AS TIME) my_char_30 id
NULL NULL 1
NULL 2
00:00:00 <--------30 characters-------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 20
Warnings:
Expand Down
15 changes: 8 additions & 7 deletions mysql-test/suite/funcs_1/r/is_columns_mysql.result
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def mysql general_log thread_id 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL b
def mysql general_log user_host 2 NULL NO mediumtext 16777215 16777215 NULL NULL NULL utf8 utf8_general_ci mediumtext select,insert,update,references
def mysql gtid_executed interval_end 3 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) select,insert,update,references Last number of interval.
def mysql gtid_executed interval_start 2 NULL NO bigint NULL NULL 19 0 NULL NULL NULL bigint(20) PRI select,insert,update,references First number of interval.
def mysql gtid_executed source_uuid 1 NULL NO char 36 36 NULL NULL NULL latin1 latin1_swedish_ci char(36) PRI select,insert,update,references uuid of the source where the transaction was originally executed.
def mysql gtid_executed source_uuid 1 NULL NO char 36 144 NULL NULL NULL utf8mb4 utf8mb4_general_ci char(36) PRI select,insert,update,references uuid of the source where the transaction was originally executed.
def mysql help_category help_category_id 1 NULL NO smallint NULL NULL 5 0 NULL NULL NULL smallint(5) unsigned PRI select,insert,update,references
def mysql help_category name 2 NULL NO char 64 192 NULL NULL NULL utf8 utf8_general_ci char(64) UNI select,insert,update,references
def mysql help_category parent_category_id 3 NULL YES smallint NULL NULL 5 0 NULL NULL NULL smallint(5) unsigned select,insert,update,references
Expand Down Expand Up @@ -105,10 +105,10 @@ def mysql innodb_table_stats sum_of_other_index_sizes 6 NULL NO bigint NULL NULL
def mysql innodb_table_stats table_name 2 NULL NO varchar 199 597 NULL NULL NULL utf8 utf8_bin varchar(199) PRI select,insert,update,references
def mysql ndb_binlog_index deletes 6 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references
def mysql ndb_binlog_index epoch 3 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned PRI select,insert,update,references
def mysql ndb_binlog_index File 2 NULL NO varchar 255 255 NULL NULL NULL latin1 latin1_swedish_ci varchar(255) select,insert,update,references
def mysql ndb_binlog_index File 2 NULL NO varchar 255 1020 NULL NULL NULL utf8mb4 utf8mb4_general_ci varchar(255) select,insert,update,references
def mysql ndb_binlog_index gci 10 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references
def mysql ndb_binlog_index inserts 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned select,insert,update,references
def mysql ndb_binlog_index next_file 12 NULL NO varchar 255 255 NULL NULL NULL latin1 latin1_swedish_ci varchar(255) select,insert,update,references
def mysql ndb_binlog_index next_file 12 NULL NO varchar 255 1020 NULL NULL NULL utf8mb4 utf8mb4_general_ci varchar(255) select,insert,update,references
def mysql ndb_binlog_index next_position 11 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
def mysql ndb_binlog_index orig_epoch 9 NULL NO bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned PRI select,insert,update,references
def mysql ndb_binlog_index orig_server_id 8 NULL NO int NULL NULL 10 0 NULL NULL NULL int(10) unsigned PRI select,insert,update,references
Expand Down Expand Up @@ -308,7 +308,6 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME
1.0000 longblob NULL NULL
1.0000 mediumblob NULL NULL
1.0000 char latin1 latin1_swedish_ci
1.0000 varchar latin1 latin1_swedish_ci
1.0000 text utf8 utf8_bin
1.0000 mediumtext utf8 utf8_general_ci
1.0000 text utf8 utf8_general_ci
Expand All @@ -329,6 +328,8 @@ COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME
3.0000 enum utf8 utf8_general_ci
3.0000 set utf8 utf8_general_ci
3.0000 varchar utf8 utf8_general_ci
4.0000 char utf8mb4 utf8mb4_general_ci
4.0000 varchar utf8mb4 utf8mb4_general_ci
SELECT DISTINCT
CHARACTER_OCTET_LENGTH / CHARACTER_MAXIMUM_LENGTH AS COL_CML,
DATA_TYPE,
Expand Down Expand Up @@ -430,7 +431,7 @@ NULL mysql general_log thread_id bigint NULL NULL NULL NULL bigint(21) unsigned
NULL mysql general_log server_id int NULL NULL NULL NULL int(10) unsigned
3.0000 mysql general_log command_type varchar 64 192 utf8 utf8_general_ci varchar(64)
1.0000 mysql general_log argument mediumblob 16777215 16777215 NULL NULL mediumblob
1.0000 mysql gtid_executed source_uuid char 36 36 latin1 latin1_swedish_ci char(36)
4.0000 mysql gtid_executed source_uuid char 36 144 utf8mb4 utf8mb4_general_ci char(36)
NULL mysql gtid_executed interval_start bigint NULL NULL NULL NULL bigint(20)
NULL mysql gtid_executed interval_end bigint NULL NULL NULL NULL bigint(20)
NULL mysql help_category help_category_id smallint NULL NULL NULL NULL smallint(5) unsigned
Expand Down Expand Up @@ -462,7 +463,7 @@ NULL mysql innodb_table_stats n_rows bigint NULL NULL NULL NULL bigint(20) unsig
NULL mysql innodb_table_stats clustered_index_size bigint NULL NULL NULL NULL bigint(20) unsigned
NULL mysql innodb_table_stats sum_of_other_index_sizes bigint NULL NULL NULL NULL bigint(20) unsigned
NULL mysql ndb_binlog_index Position bigint NULL NULL NULL NULL bigint(20) unsigned
1.0000 mysql ndb_binlog_index File varchar 255 255 latin1 latin1_swedish_ci varchar(255)
4.0000 mysql ndb_binlog_index File varchar 255 1020 utf8mb4 utf8mb4_general_ci varchar(255)
NULL mysql ndb_binlog_index epoch bigint NULL NULL NULL NULL bigint(20) unsigned
NULL mysql ndb_binlog_index inserts int NULL NULL NULL NULL int(10) unsigned
NULL mysql ndb_binlog_index updates int NULL NULL NULL NULL int(10) unsigned
Expand All @@ -472,7 +473,7 @@ NULL mysql ndb_binlog_index orig_server_id int NULL NULL NULL NULL int(10) unsig
NULL mysql ndb_binlog_index orig_epoch bigint NULL NULL NULL NULL bigint(20) unsigned
NULL mysql ndb_binlog_index gci int NULL NULL NULL NULL int(10) unsigned
NULL mysql ndb_binlog_index next_position bigint NULL NULL NULL NULL bigint(20) unsigned
1.0000 mysql ndb_binlog_index next_file varchar 255 255 latin1 latin1_swedish_ci varchar(255)
4.0000 mysql ndb_binlog_index next_file varchar 255 1020 utf8mb4 utf8mb4_general_ci varchar(255)
3.0000 mysql plugin name varchar 64 192 utf8 utf8_general_ci varchar(64)
3.0000 mysql plugin dl varchar 128 384 utf8 utf8_general_ci varchar(128)
3.0000 mysql proc db char 64 192 utf8 utf8_bin char(64)
Expand Down
1 change: 1 addition & 0 deletions mysql-test/suite/funcs_1/r/is_events.result
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ event_type NOT IN ('ONE TIME','RECURRING') or
status NOT IN ('ENABLED','DISABLED','SLAVESIDE_DISABLED') or
on_completion NOT IN ('PRESERVE','NOT PRESERVE');
event_catalog event_name event_body event_type event_type status on_completion
def daily_event SQL RECURRING RECURRING ENABLED NOT PRESERVE
########################################################################
# Testcases 3.2.1.3-3.2.1.5 + 3.2.1.8-3.2.1.12: INSERT/UPDATE/DELETE and
# DDL on INFORMATION_SCHEMA tables are not supported
Expand Down
2 changes: 2 additions & 0 deletions mysql-test/suite/funcs_1/r/is_schemata.result
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@ FROM information_schema.schemata
WHERE catalog_name IS NOT NULL or sql_path IS NOT NULL;
catalog_name schema_name sql_path
def information_schema NULL
def cache NULL
def mtr NULL
def mysql NULL
def performance_schema NULL
def sys NULL
def sys_stonedb NULL
def test NULL
###############################################################################
# Testcases 3.2.9.2+3.2.9.3: INFORMATION_SCHEMA.SCHEMATA accessible information
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/funcs_1/r/is_tables_mysql.result
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ AUTO_INCREMENT NULL
CREATE_TIME #CRT#
UPDATE_TIME #UT#
CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
TABLE_COLLATION utf8mb4_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
Expand Down Expand Up @@ -328,7 +328,7 @@ AUTO_INCREMENT NULL
CREATE_TIME #CRT#
UPDATE_TIME #UT#
CHECK_TIME #CT#
TABLE_COLLATION latin1_swedish_ci
TABLE_COLLATION utf8mb4_general_ci
CHECKSUM NULL
CREATE_OPTIONS #CO#
TABLE_COMMENT #TC#
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/funcs_1/r/is_triggers.result
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
OR action_reference_new_table IS NOT NULL;
TRIGGER_CATALOG TRIGGER_SCHEMA TRIGGER_NAME EVENT_MANIPULATION EVENT_OBJECT_CATALOG EVENT_OBJECT_SCHEMA EVENT_OBJECT_TABLE ACTION_ORDER ACTION_CONDITION ACTION_STATEMENT ACTION_ORIENTATION ACTION_TIMING ACTION_REFERENCE_OLD_TABLE ACTION_REFERENCE_NEW_TABLE ACTION_REFERENCE_OLD_ROW ACTION_REFERENCE_NEW_ROW CREATED SQL_MODE DEFINER CHARACTER_SET_CLIENT COLLATION_CONNECTION DATABASE_COLLATION
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci latin1_swedish_ci
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci utf8mb4_general_ci
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SELECT "" REGEXP NEW.pattern INTO dummy; END ROW BEFORE NULL NULL OLD NEW # root@localhost latin1 latin1_swedish_ci utf8mb4_general_ci
def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # mysql.sys@localhost utf8 utf8_general_ci utf8_general_ci
def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN SET NEW.set_by = USER(); END IF; END ROW BEFORE NULL NULL OLD NEW # mysql.sys@localhost utf8 utf8_general_ci utf8_general_ci
##################################################################################
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/funcs_1/r/memory_func_view.result
Original file line number Diff line number Diff line change
Expand Up @@ -3775,7 +3775,7 @@ CAST(my_varbinary_1000 AS TIME) my_varbinary_1000 id
NULL NULL 1
NULL 2
00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 23
Warnings:
Expand Down Expand Up @@ -3813,7 +3813,7 @@ CAST(my_binary_30 AS TIME) my_binary_30 id
NULL NULL 1
00:00:00 2
00:00:00 <--------30 characters-------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
NULL -1 5
41:58:00 1 17:58 22
Warnings:
Expand Down Expand Up @@ -3851,7 +3851,7 @@ CAST(my_varchar_1000 AS TIME) my_varchar_1000 id
NULL NULL 1
NULL 2
00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 21
Warnings:
Expand Down Expand Up @@ -3887,7 +3887,7 @@ CAST(my_char_30 AS TIME) my_char_30 id
NULL NULL 1
NULL 2
00:00:00 <--------30 characters-------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 20
Warnings:
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/funcs_1/r/myisam_func_view.result
Original file line number Diff line number Diff line change
Expand Up @@ -3775,7 +3775,7 @@ CAST(my_varbinary_1000 AS TIME) my_varbinary_1000 id
NULL NULL 1
NULL 2
00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 23
Warnings:
Expand Down Expand Up @@ -3813,7 +3813,7 @@ CAST(my_binary_30 AS TIME) my_binary_30 id
NULL NULL 1
00:00:00 2
00:00:00 <--------30 characters-------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
NULL -1 5
41:58:00 1 17:58 22
Warnings:
Expand Down Expand Up @@ -3851,7 +3851,7 @@ CAST(my_varchar_1000 AS TIME) my_varchar_1000 id
NULL NULL 1
NULL 2
00:00:00 <---------1000 characters--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 21
Warnings:
Expand Down Expand Up @@ -3887,7 +3887,7 @@ CAST(my_char_30 AS TIME) my_char_30 id
NULL NULL 1
NULL 2
00:00:00 <--------30 characters-------> 3
00:00:00 ---äÖüß@µ*$-- 4
-00:00:00 ---äÖüß@µ*$-- 4
-00:00:01 -1 5
41:58:00 1 17:58 20
Warnings:
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/perfschema/r/binlog_edge_mix.result
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ include/show_binlog_events.inc
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query # # drop database if exists my_replicated_db
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_latin1'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'latin1_swedish_ci'))
master-bin.000001 # Query # # use `mtr`; INSERT INTO test_suppressions (pattern) VALUES ( NAME_CONST('pattern',_utf8mb4'Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT' COLLATE 'utf8mb4_general_ci'))
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # create database my_replicated_db
master-bin.000001 # Query # # use `test`; create table my_replicated_db.my_tx_table(a bigint) engine = innodb
Expand Down
Loading