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/events_logs_tests.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/events_logs_tests.result')
| -rw-r--r-- | mysql-test/main/events_logs_tests.result | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/main/events_logs_tests.result b/mysql-test/main/events_logs_tests.result index 9cc6e44511c..ac4a43118da 100644 --- a/mysql-test/main/events_logs_tests.result +++ b/mysql-test/main/events_logs_tests.result @@ -1,3 +1,4 @@ +set @save_long_query_time=@@long_query_time; drop database if exists events_test; create database if not exists events_test; use events_test; @@ -68,5 +69,5 @@ user_host db sql_text USER_HOST events_test select 'events_logs_test' as inside_event, sleep(1.5) drop database events_test; set global event_scheduler=off; -set @@global.long_query_time=default; -set @@session.long_query_time=default; +set @@global.long_query_time=@save_long_query_time; +set @@session.long_query_time=@save_long_query_time; |