Skip to content

Commit d175c8b

Browse files
marcalffmarcalff
committed
WL#12673 Move the SYS schema sources into the mysql server tree
Patch for 8.0 Approved by: Marc Alff <marc.alff@oracle.com> Approved by: Chris Powers <chris.powers@oracle.com> Approved by: Sivert Sorumgaard <sivert.sorumgaard@oracle.com> Approved by: Tor Didriksen <tor.didriksen@oracle.com>
1 parent 6ea0701 commit d175c8b

Some content is hidden

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

42 files changed

+1479
-1067
lines changed

‎cmake/mysql_version.cmake

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -159,15 +159,3 @@ ENDIF()
159159
IF(NOT COMPILATION_COMMENT_SERVER)
160160
SET(COMPILATION_COMMENT_SERVER ${COMPILATION_COMMENT})
161161
ENDIF()
162-
163-
# Get the sys schema version from the mysql_sys_schema.sql file
164-
# however if compiling without performance schema, always use version 1.0.0
165-
MACRO(GET_SYS_SCHEMA_VERSION)
166-
FILE (STRINGS ${CMAKE_SOURCE_DIR}/scripts/mysql_sys_schema.sql str REGEX "SELECT \\'([0-9]+\\.[0-9]+\\.[0-9]+)\\' AS sys_version")
167-
IF(str)
168-
STRING(REGEX MATCH "([0-9]+\\.[0-9]+\\.[0-9]+)" SYS_SCHEMA_VERSION "${str}")
169-
ENDIF()
170-
ENDMACRO()
171-
172-
GET_SYS_SCHEMA_VERSION()
173-

‎include/mysql_version.h.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#define MYSQL_COMPILATION_COMMENT_SERVER "@COMPILATION_COMMENT_SERVER@"
2424
#define LIBMYSQL_VERSION "@VERSION@"
2525
#define LIBMYSQL_VERSION_ID @MYSQL_VERSION_ID@
26-
#define SYS_SCHEMA_VERSION "@SYS_SCHEMA_VERSION@"
2726

2827
#ifndef LICENSE
2928
#define LICENSE GPL

‎mysql-test/include/mtr_check.sql

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
-- along with this program; if not, write to the Free Software
2121
-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2222

23-
delimiter ||;
23+
delimiter ;
2424

25-
use mtr||
25+
use mtr;
26+
27+
DELIMITER $$
2628

2729
CREATE DEFINER=root@localhost PROCEDURE check_testcase_perfschema()
2830
BEGIN
@@ -61,12 +63,11 @@ BEGIN
6163
ORDER BY UDF_NAME;
6264
END;
6365
END IF;
64-
END||
66+
END$$
6567

66-
--
6768
-- Procedure used to check if server has been properly
6869
-- restored after testcase has been run
69-
--
70+
7071
CREATE DEFINER=root@localhost PROCEDURE check_testcase()
7172
BEGIN
7273

@@ -182,14 +183,15 @@ BEGIN
182183
mysql.time_zone_transition_type,
183184
mysql.user;
184185

185-
END||
186+
END$$
186187

187-
--
188188
-- Procedure used by test case used to force all
189189
-- servers to restart after testcase and thus skipping
190190
-- check test case after test
191-
--
192191
CREATE DEFINER=root@localhost PROCEDURE force_restart()
193192
BEGIN
194193
SELECT 1 INTO OUTFILE 'force_restart';
195-
END||
194+
END$$
195+
196+
DELIMITER ;
197+

‎mysql-test/include/mtr_warnings.sql

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,30 @@
2424
-- signifying a real problem or are generated by many tests. If the warning
2525
-- is seen only with few tests suppress them within the tests.
2626

27-
delimiter ||;
27+
delimiter ;
2828

29-
use mtr||
29+
use mtr;
3030

3131
--
3232
-- Create table where testcases can insert patterns to
3333
-- be suppressed
3434
--
3535
CREATE TABLE test_suppressions (
3636
pattern VARCHAR(255)
37-
)||
37+
);
3838

3939

4040
--
4141
-- Declare a trigger that makes sure
4242
-- no invalid patterns can be inserted
4343
-- into test_suppressions
4444
--
45-
SET @character_set_client_saved = @@character_set_client||
46-
SET @character_set_results_saved = @@character_set_results||
47-
SET @collation_connection_saved = @@collation_connection||
48-
SET @@character_set_client = latin1||
49-
SET @@character_set_results = latin1||
50-
SET @@collation_connection = latin1_swedish_ci||
45+
SET @character_set_client_saved = @@character_set_client;
46+
SET @character_set_results_saved = @@character_set_results;
47+
SET @collation_connection_saved = @@collation_connection;
48+
SET @@character_set_client = latin1;
49+
SET @@character_set_results = latin1;
50+
SET @@collation_connection = latin1_swedish_ci;
5151
/*!50002
5252
CREATE DEFINER=root@localhost TRIGGER ts_insert
5353
BEFORE INSERT ON test_suppressions
@@ -57,30 +57,30 @@ FOR EACH ROW BEGIN
5757
SELECT "" REGEXP NEW.pattern INTO dummy;
5858
SET GLOBAL regexp_time_limit = DEFAULT;
5959
END
60-
*/||
61-
SET @@character_set_client = @character_set_client_saved||
62-
SET @@character_set_results = @character_set_results_saved||
63-
SET @@collation_connection = @collation_connection_saved||
60+
*/;
61+
SET @@character_set_client = @character_set_client_saved;
62+
SET @@character_set_results = @character_set_results_saved;
63+
SET @@collation_connection = @collation_connection_saved;
6464

6565

6666
--
6767
-- Load table with patterns that will be suppressed globally(always)
6868
--
6969
CREATE TABLE global_suppressions (
7070
pattern VARCHAR(255)
71-
)||
71+
);
7272

7373

7474
-- Declare a trigger that makes sure
7575
-- no invalid patterns can be inserted
7676
-- into global_suppressions
7777
--
78-
SET @character_set_client_saved = @@character_set_client||
79-
SET @character_set_results_saved = @@character_set_results||
80-
SET @collation_connection_saved = @@collation_connection||
81-
SET @@character_set_client = latin1||
82-
SET @@character_set_results = latin1||
83-
SET @@collation_connection = latin1_swedish_ci||
78+
SET @character_set_client_saved = @@character_set_client;
79+
SET @character_set_results_saved = @@character_set_results;
80+
SET @collation_connection_saved = @@collation_connection;
81+
SET @@character_set_client = latin1;
82+
SET @@character_set_results = latin1;
83+
SET @@collation_connection = latin1_swedish_ci;
8484
/*!50002
8585
CREATE DEFINER=root@localhost TRIGGER gs_insert
8686
BEFORE INSERT ON global_suppressions
@@ -90,10 +90,10 @@ FOR EACH ROW BEGIN
9090
SELECT "" REGEXP NEW.pattern INTO dummy;
9191
SET GLOBAL regexp_time_limit = DEFAULT;
9292
END
93-
*/||
94-
SET @@character_set_client = @character_set_client_saved||
95-
SET @@character_set_results = @character_set_results_saved||
96-
SET @@collation_connection = @collation_connection_saved||
93+
*/;
94+
SET @@character_set_client = @character_set_client_saved;
95+
SET @@character_set_results = @character_set_results_saved;
96+
SET @@collation_connection = @collation_connection_saved;
9797

9898

9999

@@ -265,9 +265,11 @@ INSERT INTO global_suppressions VALUES
265265
*/
266266
("The SSL library function CRYPTO_set_mem_functions failed"),
267267

268-
("THE_LAST_SUPPRESSION")||
268+
("THE_LAST_SUPPRESSION");
269269

270270

271+
DELIMITER $$
272+
271273
--
272274
-- Procedure that uses the above created tables to check
273275
-- the servers error log for warnings
@@ -304,7 +306,7 @@ BEGIN
304306
IF @num_warnings > 0 THEN
305307
SELECT line
306308
FROM error_log WHERE suspicious=1;
307-
--SELECT * FROM test_suppressions;
309+
-- SELECT * FROM test_suppressions;
308310
-- Return 2 -> check failed
309311
SELECT 2 INTO result;
310312
ELSE
@@ -316,7 +318,7 @@ BEGIN
316318
TRUNCATE test_suppressions;
317319
DROP TABLE error_log;
318320

319-
END||
321+
END$$
320322

321323
--
322324
-- Declare a procedure testcases can use to insert test
@@ -328,6 +330,9 @@ PROCEDURE add_suppression(pattern VARCHAR(255))
328330
BEGIN
329331
INSERT INTO test_suppressions (pattern) VALUES (pattern);
330332
END
331-
*/||
333+
*/$$
334+
335+
DELIMITER ;
336+
332337

333338

‎mysql-test/mysql-test-run.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3974,13 +3974,13 @@ sub mysql_install_db {
39743974
"INSERT INTO mysql.proxies_priv VALUES ('localhost', 'root',
39753975
'', '', TRUE, '', now());\n");
39763976

3977-
# Add help tables and data for warning detection and supression
3977+
# Add help tables and data for warning detection and suppression
39783978
mtr_tofile($bootstrap_sql_file,
3979-
sql_to_bootstrap(mtr_grab_file("include/mtr_warnings.sql")));
3979+
mtr_grab_file("include/mtr_warnings.sql"));
39803980

39813981
# Add procedures for checking server is restored after testcase
39823982
mtr_tofile($bootstrap_sql_file,
3983-
sql_to_bootstrap(mtr_grab_file("include/mtr_check.sql")));
3983+
mtr_grab_file("include/mtr_check.sql"));
39843984

39853985
if (defined $init_file) {
39863986
# Append the contents of the init-file to the end of bootstrap.sql

‎mysql-test/suite/binlog_gtid/t/binlog_gtid_mysqldump.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ DROP TABLE t1;
4444
RESET MASTER;
4545

4646
--echo # restore
47-
--exec $MYSQL < $MYSQL_TMP_DIR/mysql$name.sql
47+
--exec $MYSQL --comments < $MYSQL_TMP_DIR/mysql$name.sql
4848

4949
--echo ==== Verify after restoring from $name ====
5050

‎mysql-test/suite/funcs_1/r/is_triggers.result

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,28 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
8282
OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
8383
OR action_reference_new_table IS NOT NULL;
8484
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
85-
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SET GLOBAL regexp_time_limit = 0; SELECT "" REGEXP NEW.pattern INTO dummy; SET GLOBAL regexp_time_limit = DEFAULT; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
86-
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SET GLOBAL regexp_time_limit = 0; SELECT "" REGEXP NEW.pattern INTO dummy; SET GLOBAL regexp_time_limit = DEFAULT; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
87-
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 # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
88-
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 # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
85+
def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN
86+
IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN
87+
SET NEW.set_by = USER();
88+
END IF;
89+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
90+
def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN
91+
IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN
92+
SET NEW.set_by = USER();
93+
END IF;
94+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
95+
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN
96+
DECLARE dummy INT;
97+
SET GLOBAL regexp_time_limit = 0;
98+
SELECT "" REGEXP NEW.pattern INTO dummy;
99+
SET GLOBAL regexp_time_limit = DEFAULT;
100+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
101+
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN
102+
DECLARE dummy INT;
103+
SET GLOBAL regexp_time_limit = 0;
104+
SELECT "" REGEXP NEW.pattern INTO dummy;
105+
SET GLOBAL regexp_time_limit = DEFAULT;
106+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
89107
##################################################################################
90108
# Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
91109
##################################################################################

‎mysql-test/suite/funcs_1/r/is_triggers_ci.result

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,28 @@ WHERE trigger_catalog IS NOT NULL OR event_object_catalog IS NOT NULL
8282
OR action_condition IS NOT NULL OR action_reference_old_table IS NOT NULL
8383
OR action_reference_new_table IS NOT NULL;
8484
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
85-
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN DECLARE dummy INT; SET GLOBAL regexp_time_limit = 0; SELECT "" REGEXP NEW.pattern INTO dummy; SET GLOBAL regexp_time_limit = DEFAULT; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
86-
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN DECLARE dummy INT; SET GLOBAL regexp_time_limit = 0; SELECT "" REGEXP NEW.pattern INTO dummy; SET GLOBAL regexp_time_limit = DEFAULT; END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
87-
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 # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
88-
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 # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
85+
def sys sys_config_insert_set_user INSERT def sys sys_config 1 NULL BEGIN
86+
IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN
87+
SET NEW.set_by = USER();
88+
END IF;
89+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
90+
def sys sys_config_update_set_user UPDATE def sys sys_config 1 NULL BEGIN
91+
IF @sys.ignore_sys_config_triggers != true AND NEW.set_by IS NULL THEN
92+
SET NEW.set_by = USER();
93+
END IF;
94+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION mysql.sys@localhost utf8mb4 utf8mb4_0900_ai_ci utf8mb4_0900_ai_ci
95+
def mtr ts_insert INSERT def mtr test_suppressions 1 NULL BEGIN
96+
DECLARE dummy INT;
97+
SET GLOBAL regexp_time_limit = 0;
98+
SELECT "" REGEXP NEW.pattern INTO dummy;
99+
SET GLOBAL regexp_time_limit = DEFAULT;
100+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
101+
def mtr gs_insert INSERT def mtr global_suppressions 1 NULL BEGIN
102+
DECLARE dummy INT;
103+
SET GLOBAL regexp_time_limit = 0;
104+
SELECT "" REGEXP NEW.pattern INTO dummy;
105+
SET GLOBAL regexp_time_limit = DEFAULT;
106+
END ROW BEFORE NULL NULL OLD NEW # ONLY_FULL_GROUP_BY,STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION root@localhost latin1 latin1_swedish_ci utf8mb4_0900_ai_ci
89107
##################################################################################
90108
# Testcase 3.2.18.2 + 3.2.18.3: INFORMATION_SCHEMA.TRIGGERS accessible information
91109
##################################################################################

‎mysql-test/suite/sysschema/r/all_sys_objects_exist.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,4 +158,4 @@ sys_config_insert_set_user
158158
sys_config_update_set_user
159159
SELECT sys_version FROM sys.version;
160160
sys_version
161-
2.1.0
161+
2.1.1

‎mysql-test/suite/sysschema/r/pr_ps_setup_reset_to_default.result

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,58 @@
11
CALL sys.ps_setup_reset_to_default(TRUE);
22
status
33
Resetting: setup_actors
4-
DELETE FROM performance_schema.setup_actors WHERE NOT (HOST = '%' AND USER = '%' AND `ROLE` = '%')
4+
DELETE
5+
FROM performance_schema.setup_actors
6+
WHERE NOT (HOST = '%' AND USER = '%' AND `ROLE` = '%')
57
status
68
Resetting: setup_actors
7-
INSERT IGNORE INTO performance_schema.setup_actors VALUES ('%', '%', '%', 'YES', 'YES')
9+
INSERT IGNORE INTO performance_schema.setup_actors
10+
VALUES ('%', '%', '%', 'YES', 'YES')
811
status
912
Resetting: setup_instruments
10-
UPDATE performance_schema.setup_instruments SET ENABLED = sys.ps_is_instrument_default_enabled(NAME), TIMED = sys.ps_is_instrument_default_timed(NAME)
13+
UPDATE performance_schema.setup_instruments
14+
SET ENABLED = sys.ps_is_instrument_default_enabled(NAME),
15+
TIMED = sys.ps_is_instrument_default_timed(NAME)
1116
status
1217
Resetting: setup_consumers
13-
UPDATE performance_schema.setup_consumers SET ENABLED = IF(NAME IN ('events_statements_current', 'events_transactions_current', 'global_instrumentation', 'thread_instrumentation', 'statements_digest'), 'YES', 'NO')
18+
UPDATE performance_schema.setup_consumers
19+
SET ENABLED = IF(NAME IN ('events_statements_current', 'events_transactions_current', 'global_instrumentation', 'thread_instrumentation', 'statements_digest'), 'YES', 'NO')
1420
status
1521
Resetting: setup_objects
16-
DELETE FROM performance_schema.setup_objects WHERE NOT (OBJECT_TYPE IN ('EVENT', 'FUNCTION', 'PROCEDURE', 'TABLE', 'TRIGGER') AND OBJECT_NAME = '%'AND (OBJECT_SCHEMA = 'mysql'AND ENABLED = 'NO'AND TIMED = 'NO' ) OR (OBJECT_SCHEMA = 'performance_schema' AND ENABLED = 'NO'AND TIMED = 'NO' ) OR (OBJECT_SCHEMA = 'information_schema' AND ENABLED = 'NO'AND TIMED = 'NO' ) OR (OBJECT_SCHEMA = '%'AND ENABLED = 'YES' AND TIMED = 'YES'))
22+
DELETE
23+
FROM performance_schema.setup_objects
24+
WHERE NOT (OBJECT_TYPE IN ('EVENT', 'FUNCTION', 'PROCEDURE', 'TABLE', 'TRIGGER') AND OBJECT_NAME = '%'
25+
AND (OBJECT_SCHEMA = 'mysql'AND ENABLED = 'NO'AND TIMED = 'NO' )
26+
OR (OBJECT_SCHEMA = 'performance_schema' AND ENABLED = 'NO'AND TIMED = 'NO' )
27+
OR (OBJECT_SCHEMA = 'information_schema' AND ENABLED = 'NO'AND TIMED = 'NO' )
28+
OR (OBJECT_SCHEMA = '%'AND ENABLED = 'YES' AND TIMED = 'YES'))
1729
status
1830
Resetting: setup_objects
19-
INSERT IGNORE INTO performance_schema.setup_objects VALUES ('EVENT', 'mysql' , '%', 'NO' , 'NO' ), ('EVENT', 'performance_schema', '%', 'NO' , 'NO' ), ('EVENT', 'information_schema', '%', 'NO' , 'NO' ), ('EVENT', '%' , '%', 'YES', 'YES'), ('FUNCTION' , 'mysql' , '%', 'NO' , 'NO' ), ('FUNCTION' , 'performance_schema', '%', 'NO' , 'NO' ), ('FUNCTION' , 'information_schema', '%', 'NO' , 'NO' ), ('FUNCTION' , '%' , '%', 'YES', 'YES'), ('PROCEDURE', 'mysql' , '%', 'NO' , 'NO' ), ('PROCEDURE', 'performance_schema', '%', 'NO' , 'NO' ), ('PROCEDURE', 'information_schema', '%', 'NO' , 'NO' ), ('PROCEDURE', '%' , '%', 'YES', 'YES'), ('TABLE', 'mysql' , '%', 'NO' , 'NO' ), ('TABLE', 'performance_schema', '%', 'NO' , 'NO' ), ('TABLE', 'information_schema', '%', 'NO' , 'NO' ), ('TABLE', '%' , '%', 'YES', 'YES'), ('TRIGGER', 'mysql' , '%', 'NO' , 'NO' ), ('TRIGGER', 'performance_schema', '%', 'NO' , 'NO' ), ('TRIGGER', 'information_schema', '%', 'NO' , 'NO' ), ('TRIGGER', '%' , '%', 'YES', 'YES')
31+
INSERT IGNORE INTO performance_schema.setup_objects
32+
VALUES ('EVENT', 'mysql' , '%', 'NO' , 'NO' ),
33+
('EVENT', 'performance_schema', '%', 'NO' , 'NO' ),
34+
('EVENT', 'information_schema', '%', 'NO' , 'NO' ),
35+
('EVENT', '%' , '%', 'YES', 'YES'),
36+
('FUNCTION' , 'mysql' , '%', 'NO' , 'NO' ),
37+
('FUNCTION' , 'performance_schema', '%', 'NO' , 'NO' ),
38+
('FUNCTION' , 'information_schema', '%', 'NO' , 'NO' ),
39+
('FUNCTION' , '%' , '%', 'YES', 'YES'),
40+
('PROCEDURE', 'mysql' , '%', 'NO' , 'NO' ),
41+
('PROCEDURE', 'performance_schema', '%', 'NO' , 'NO' ),
42+
('PROCEDURE', 'information_schema', '%', 'NO' , 'NO' ),
43+
('PROCEDURE', '%' , '%', 'YES', 'YES'),
44+
('TABLE', 'mysql' , '%', 'NO' , 'NO' ),
45+
('TABLE', 'performance_schema', '%', 'NO' , 'NO' ),
46+
('TABLE', 'information_schema', '%', 'NO' , 'NO' ),
47+
('TABLE', '%' , '%', 'YES', 'YES'),
48+
('TRIGGER', 'mysql' , '%', 'NO' , 'NO' ),
49+
('TRIGGER', 'performance_schema', '%', 'NO' , 'NO' ),
50+
('TRIGGER', 'information_schema', '%', 'NO' , 'NO' ),
51+
('TRIGGER', '%' , '%', 'YES', 'YES')
2052
status
2153
Resetting: threads
22-
UPDATE performance_schema.threads SET INSTRUMENTED = 'YES'
54+
UPDATE performance_schema.threads
55+
SET INSTRUMENTED = 'YES'
2356
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
2457
TRUNCATE TABLE performance_schema.setup_actors;
2558
INSERT INTO performance_schema.setup_actors VALUES ('%', '%', '%', 'YES', 'YES');

‎mysql-test/suite/sysschema/r/v_version.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
SELECT sys_version FROM sys.version;
22
sys_version
3-
2.1.0
3+
2.1.1

0 commit comments

Comments
 (0)