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.test | |
| 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.test')
| -rw-r--r-- | mysql-test/main/log_tables.test | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mysql-test/main/log_tables.test b/mysql-test/main/log_tables.test index f822ec8d758..4ea8a7639ef 100644 --- a/mysql-test/main/log_tables.test +++ b/mysql-test/main/log_tables.test @@ -27,10 +27,6 @@ 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; - - - # # Check that log tables work and we can do basic selects. This also # tests truncate, which works in a special mode with the log tables @@ -528,7 +524,7 @@ SELECT "My own slow query", sleep(2); SELECT "My own slow query", sleep(2); ## So we look for seq 2-4 ---replace_column 1 START_TIME 2 USER_HOST 3 QUERY_TIME +--replace_column 1 START_TIME 2 USER_HOST 3 QUERY_TIME 12 THREAD_ID SELECT * FROM mysql.slow_log WHERE seq >= 2 LIMIT 3; SET GLOBAL slow_query_log = 0; |