mirror of
https://github.com/MariaDB/server.git
synced 2025-02-04 21:02:17 +01:00
56fd0d7b06
- The problem: ============== - Commitf7216fa63dcreated the check function for default temporary storage engine and in case the SE doesn't support temporary tables the error `ER_ILLEGAL_HA_CREATE_OPTION` is raised. Before that commit in such cases temporary tables were created by silently substituting default SE (RocksDB, Connect, PerfSchema) with MyISAM. - The test `pr_diagnostics.test` was modified in that commit with raising the error, since I didn't check the root cause of test itself. - The solution: =============== - This commit update the root case: procedure `ps_setup_save()` that uses temporary tables created from performance schema tables definition using `LIKE`, what is not supported. The suggested fix is to use InnoDB table by using `AS SELECT`. - Note that test `pr_diagnostics` will raise this error for `medium/full` third argument, but not for `current` value of third argument. - Additionally this patch updates the test case of commitf7216fa, by adding missing relation between temporary tables and Performance schema in `perfschema.misc` test. - Reviewed by: <wlad@mariadb.com>
97 lines
3.6 KiB
SQL
97 lines
3.6 KiB
SQL
-- Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
|
|
--
|
|
-- This program is free software; you can redistribute it and/or modify
|
|
-- it under the terms of the GNU General Public License as published by
|
|
-- the Free Software Foundation; version 2 of the License.
|
|
--
|
|
-- This program is distributed in the hope that it will be useful,
|
|
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
-- GNU General Public License for more details.
|
|
--
|
|
-- You should have received a copy of the GNU General Public License
|
|
-- along with this program; if not, write to the Free Software
|
|
-- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
DROP PROCEDURE IF EXISTS ps_setup_save;
|
|
|
|
DELIMITER $$
|
|
|
|
CREATE DEFINER='mariadb.sys'@'localhost' PROCEDURE ps_setup_save (
|
|
IN in_timeout INT
|
|
)
|
|
COMMENT '
|
|
Description
|
|
-----------
|
|
|
|
Saves the current configuration of Performance Schema,
|
|
so that you can alter the setup for debugging purposes,
|
|
but restore it to a previous state.
|
|
|
|
Use the companion procedure - ps_setup_reload_saved(), to
|
|
restore the saved config.
|
|
|
|
The named lock "sys.ps_setup_save" is taken before the
|
|
current configuration is saved. If the attempt to get the named
|
|
lock times out, an error occurs.
|
|
|
|
The lock is released after the settings have been restored by
|
|
calling ps_setup_reload_saved().
|
|
|
|
Requires the SUPER privilege for "SET sql_log_bin = 0;".
|
|
|
|
Parameters
|
|
-----------
|
|
|
|
in_timeout INT
|
|
The timeout in seconds used when trying to obtain the lock.
|
|
A negative timeout means infinite timeout.
|
|
|
|
Example
|
|
-----------
|
|
|
|
mysql> CALL sys.ps_setup_save(-1);
|
|
Query OK, 0 rows affected (0.08 sec)
|
|
|
|
mysql> UPDATE performance_schema.setup_instruments
|
|
-> SET enabled = \'YES\', timed = \'YES\';
|
|
Query OK, 547 rows affected (0.40 sec)
|
|
Rows matched: 784 Changed: 547 Warnings: 0
|
|
|
|
/* Run some tests that need more detailed instrumentation here */
|
|
|
|
mysql> CALL sys.ps_setup_reload_saved();
|
|
Query OK, 0 rows affected (0.32 sec)
|
|
'
|
|
SQL SECURITY INVOKER
|
|
NOT DETERMINISTIC
|
|
MODIFIES SQL DATA
|
|
BEGIN
|
|
DECLARE v_lock_result INT;
|
|
|
|
SET @log_bin := @@sql_log_bin;
|
|
SET sql_log_bin = 0;
|
|
|
|
SELECT GET_LOCK('sys.ps_setup_save', in_timeout) INTO v_lock_result;
|
|
|
|
IF v_lock_result THEN
|
|
DROP TEMPORARY TABLE IF EXISTS tmp_setup_actors;
|
|
DROP TEMPORARY TABLE IF EXISTS tmp_setup_consumers;
|
|
DROP TEMPORARY TABLE IF EXISTS tmp_setup_instruments;
|
|
DROP TEMPORARY TABLE IF EXISTS tmp_threads;
|
|
|
|
CREATE TEMPORARY TABLE tmp_setup_actors AS SELECT * FROM performance_schema.setup_actors;
|
|
CREATE TEMPORARY TABLE tmp_setup_consumers AS SELECT * FROM performance_schema.setup_consumers;
|
|
CREATE TEMPORARY TABLE tmp_setup_instruments AS SELECT * FROM performance_schema.setup_instruments;
|
|
CREATE TEMPORARY TABLE tmp_threads (THREAD_ID bigint unsigned NOT NULL PRIMARY KEY, INSTRUMENTED enum('YES','NO') NOT NULL);
|
|
|
|
INSERT INTO tmp_threads SELECT THREAD_ID, INSTRUMENTED FROM performance_schema.threads;
|
|
ELSE
|
|
SIGNAL SQLSTATE VALUE '90000'
|
|
SET MESSAGE_TEXT = 'Could not lock the sys.ps_setup_save user lock, another thread has a saved configuration';
|
|
END IF;
|
|
|
|
SET sql_log_bin = @log_bin;
|
|
END$$
|
|
|
|
DELIMITER ;
|