Skip to content
This repository was archived by the owner on Aug 28, 2024. It is now read-only.

Commit 300103b

Browse files
committed
Ensure the tests in the test suite do not run with embedded tests for MySQL (P_S is not enabled with embedded, and so neither should sys be)
1 parent 376ebda commit 300103b

File tree

65 files changed

+82
-2
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+82
-2
lines changed

mysql-test/suite/sysschema/r/v_innodb_lock_waits.result

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ locked_table varchar(1024) NO
66
locked_index varchar(1024) YES NULL
77
locked_type varchar(32) NO
88
waiting_trx_id varchar(18) NO
9+
waiting_trx_started datetime NO 0000-00-00 00:00:00
10+
waiting_trx_age time YES NULL
11+
waiting_trx_rows_locked bigint(21) unsigned NO 0
12+
waiting_trx_rows_modified bigint(21) unsigned NO 0
913
waiting_pid bigint(21) unsigned NO 0
1014
waiting_query longtext YES NULL
1115
waiting_lock_id varchar(81) NO
@@ -15,6 +19,10 @@ blocking_pid bigint(21) unsigned NO 0
1519
blocking_query longtext YES NULL
1620
blocking_lock_id varchar(81) NO
1721
blocking_lock_mode varchar(32) NO
22+
blocking_trx_started datetime NO 0000-00-00 00:00:00
23+
blocking_trx_age time YES NULL
24+
blocking_trx_rows_locked bigint(21) unsigned NO 0
25+
blocking_trx_rows_modified bigint(21) unsigned NO 0
1826
SELECT * FROM sys.innodb_lock_waits;
1927
DESC sys.x$innodb_lock_waits;
2028
Field Type Null Key Default Extra
@@ -24,6 +32,10 @@ locked_table varchar(1024) NO
2432
locked_index varchar(1024) YES NULL
2533
locked_type varchar(32) NO
2634
waiting_trx_id varchar(18) NO
35+
waiting_trx_started datetime NO 0000-00-00 00:00:00
36+
waiting_trx_age time YES NULL
37+
waiting_trx_rows_locked bigint(21) unsigned NO 0
38+
waiting_trx_rows_modified bigint(21) unsigned NO 0
2739
waiting_pid bigint(21) unsigned NO 0
2840
waiting_query varchar(1024) YES NULL
2941
waiting_lock_id varchar(81) NO
@@ -33,4 +45,8 @@ blocking_pid bigint(21) unsigned NO 0
3345
blocking_query varchar(1024) YES NULL
3446
blocking_lock_id varchar(81) NO
3547
blocking_lock_mode varchar(32) NO
48+
blocking_trx_started datetime NO 0000-00-00 00:00:00
49+
blocking_trx_age time YES NULL
50+
blocking_trx_rows_locked bigint(21) unsigned NO 0
51+
blocking_trx_rows_modified bigint(21) unsigned NO 0
3652
SELECT * FROM sys.x$innodb_lock_waits;

mysql-test/suite/sysschema/t/all_sys_objects_exist.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Ensure database exists
23
USE sys;
34

mysql-test/suite/sysschema/t/fn_extract_schema_from_file_name.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.extract_schema_from_file_name() function perfoms as expected
34

mysql-test/suite/sysschema/t/fn_extract_table_from_file_name.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.extract_table_from_file_name() function perfoms as expected
34

mysql-test/suite/sysschema/t/fn_format_bytes.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.format_bytes() function perfoms as expected
34

mysql-test/suite/sysschema/t/fn_format_path.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.format_path() function perfoms as expected
34
#

mysql-test/suite/sysschema/t/fn_format_statement.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.format_statement() function perfoms as expected
34

mysql-test/suite/sysschema/t/fn_format_time.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.format_time() function perfoms as expected
34

mysql-test/suite/sysschema/t/fn_ps_is_account_enabled.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.ps_is_account_enabled() function perfoms as expected
34

mysql-test/suite/sysschema/t/fn_ps_is_consumer_enabled.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
-- source include/not_embedded.inc
12
# Tests for sys schema
23
# Verify the sys.ps_is_consumer_enabled() function perfoms as expected
34

0 commit comments

Comments
 (0)