database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/main/log_tables.test
View File

@ -836,7 +836,9 @@ SET GLOBAL slow_query_log = @old_slow_query_log;
--echo # Bug#21557 entries in the general query log truncated at 1000 characters.
--echo #
--disable_cursor_protocol
select CONNECTION_ID() into @thread_id;
--enable_cursor_protocol
--disable_ps_protocol
truncate table mysql.general_log;
--enable_ps_protocol
@ -1007,9 +1009,12 @@ INSERT INTO t1 VALUES (3,3,3);
INSERT INTO t1 VALUES (4,4,4);
--disable_ps2_protocol
#Enable after fix MDEV-31522
--disable_cursor_protocol
SELECT SQL_NO_CACHE 'Bug#31700 - SCAN',f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f3=4;
SELECT SQL_NO_CACHE 'Bug#31700 - KEY', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f2=3;
SELECT SQL_NO_CACHE 'Bug#31700 - PK', f1,f2,f3,SLEEP(1.1) FROM t1 WHERE f1=2;
--enable_cursor_protocol
--replace_column 1 TIMESTAMP
SELECT start_time, rows_examined, rows_sent, sql_text FROM mysql.slow_log WHERE sql_text LIKE '%Bug#31700%' ORDER BY start_time;
@ -1037,6 +1042,7 @@ unlock tables;
--echo #
--echo # MDEV-33267 User with minimal permissions can intentionally corrupt mysql.slow_log table
--echo #
--disable_cursor_protocol
truncate mysql.slow_log;
set global log_output= 'TABLE';
create user u@localhost;
@ -1052,6 +1058,7 @@ select 'after evil-doing', sleep(0.2);
select distinct sql_text from mysql.slow_log where sql_text like '%evil%';
set global log_output=default;
drop user u@localhost;
--enable_cursor_protocol
SET @@global.log_output= @old_log_output;
SET @@global.slow_query_log= @old_slow_query_log;