diff options
| author | Monty <monty@mariadb.org> | 2019-09-02 14:06:56 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2019-09-03 13:17:32 +0300 |
| commit | a071e0e029cd7c155cff1054d9f7f8a6aa898620 (patch) | |
| tree | b592c10cb8ca3036688ea19039208eadd485fe7c /mysql-test/main/log_tables.result | |
| parent | b0ff5a6a7393c057cd201aff63279e45d3e0cc49 (diff) | |
| parent | 9cba6c5aa3b15fffc0ca10e92bcb55a126a20701 (diff) | |
| download | mariadb-git-a071e0e029cd7c155cff1054d9f7f8a6aa898620.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/log_tables.result')
| -rw-r--r-- | mysql-test/main/log_tables.result | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/main/log_tables.result b/mysql-test/main/log_tables.result index 126230a8765..aed5dbfba3d 100644 --- a/mysql-test/main/log_tables.result +++ b/mysql-test/main/log_tables.result @@ -9,9 +9,6 @@ SET @saved_long_query_time = @@long_query_time; SET @saved_log_output = @@log_output; SET @saved_general_log = @@GLOBAL.general_log; SET @saved_slow_query_log = @@GLOBAL.slow_query_log; -SELECT @saved_long_query_time, @saved_log_output, @saved_general_log, @saved_slow_query_log; -@saved_long_query_time @saved_log_output @saved_general_log @saved_slow_query_log -10 FILE,TABLE 1 1 truncate table general_log; select * from general_log; event_time user_host thread_id server_id command_type argument @@ -436,9 +433,9 @@ My own slow query sleep(2) My own slow query 0 SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3; start_time user_host query_time lock_time rows_sent rows_examined db last_insert_id insert_id server_id sql_text thread_id rows_affected seq -START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 4 0 2 -START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 4 0 3 -START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) 4 0 4 +START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) THREAD_ID 0 2 +START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) THREAD_ID 0 3 +START_TIME USER_HOST QUERY_TIME 00:00:00.000000 1 0 test 0 0 1 SELECT "My own slow query", sleep(2) THREAD_ID 0 4 SET GLOBAL slow_query_log = 0; SET SESSION long_query_time =@saved_long_query_time; FLUSH LOGS; |