database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

MDEV-12764 main.log_tables-big fails in buildbot due to connect_log

Browse Source 
Additionally internal check was failing because the test did not
restore a global value properly
This commit is contained in:
Elena Stepanova
2017-06-03 02:48:47 +03:00
parent 36e020a5d6
commit cc7e349012
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/log_tables-big.result
View File

@@ -1,8 +1,12 @@
set @@global.log_output = 'TABLE'; set @@global.log_output = 'TABLE';
connect con1,localhost,root,,;
connect con2,localhost,root,,;
connection con1;
set session long_query_time=10; set session long_query_time=10;
select get_lock('bug27638', 1); select get_lock('bug27638', 1);
get_lock('bug27638', 1) get_lock('bug27638', 1)
1 1
connection con2;
set session long_query_time=1; set session long_query_time=1;
select get_lock('bug27638', 2); select get_lock('bug27638', 2);
get_lock('bug27638', 2) get_lock('bug27638', 2)
@@ -25,7 +29,11 @@ select if (query_time >= '00:01:40', 'OK', 'WRONG') as qt, sql_text from mysql.s
where sql_text = 'select get_lock(\'bug27638\', 101)'; where sql_text = 'select get_lock(\'bug27638\', 101)';
qt sql_text qt sql_text
OK select get_lock('bug27638', 101) OK select get_lock('bug27638', 101)
connection con1;
select release_lock('bug27638'); select release_lock('bug27638');
release_lock('bug27638') release_lock('bug27638')
1 1
connection default;
disconnect con1;
disconnect con2;
set @@global.log_output=default; set @@global.log_output=default;

2
mysql-test/t/log_tables-big-master.opt
View File

@@ -1 +1 @@
--log-output=table,file --slow-query-log --general-log --general-log-file="" --slow-query-log-file="" --slow-query-log --general-log --general-log-file="" --slow-query-log-file=""