diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 14:23:55 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2015-04-20 14:23:55 +0200 |
| commit | d4e3aa4c6f4fb467b7f1adacd8ea9f71339cffe0 (patch) | |
| tree | 9f243afbf8034f0bae9f755176f87772df064819 /mysql-test | |
| parent | a15a4d674d0729f0b8eadc023ecd1b0ad0aebd88 (diff) | |
| download | mariadb-git-d4e3aa4c6f4fb467b7f1adacd8ea9f71339cffe0.tar.gz | |
After-merge fixes: .result file update
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/features.result | 3 | ||||
| -rw-r--r-- | mysql-test/r/max_statement_time.result | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/r/features.result b/mysql-test/r/features.result index 66d2c6bf71d..04e0df98ec7 100644 --- a/mysql-test/r/features.result +++ b/mysql-test/r/features.result @@ -120,6 +120,9 @@ drop trigger trg; drop table t1; show status like "%trigger%"; Variable_name Value +Binlog_group_commit_trigger_count 0 +Binlog_group_commit_trigger_lock_wait 0 +Binlog_group_commit_trigger_timeout 0 Com_create_trigger 1 Com_drop_trigger 1 Com_show_create_trigger 0 diff --git a/mysql-test/r/max_statement_time.result b/mysql-test/r/max_statement_time.result index 93c793b265a..5a2562af9b5 100644 --- a/mysql-test/r/max_statement_time.result +++ b/mysql-test/r/max_statement_time.result @@ -87,6 +87,7 @@ SLEEP(2) 1 SHOW STATUS LIKE '%timeout%'; Variable_name Value +Binlog_group_commit_trigger_timeout 0 Master_gtid_wait_timeouts 0 Ssl_default_timeout 0 Ssl_session_cache_timeouts 0 |