Skip to content

M
MariaDB
Commit d4e3aa4c authored by Kristian Nielsen's avatar Kristian Nielsen
Browse files
Options

After-merge fixes: .result file update

parent a15a4d67
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
mysql-test/r/features.result
View file @ d4e3aa4c
...@@ -120,6 +120,9 @@ drop trigger trg; ...@@ -120,6 +120,9 @@ drop trigger trg;
drop table t1; drop table t1;
show status like "%trigger%"; show status like "%trigger%";
Variable_name Value 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_create_trigger 1
Com_drop_trigger 1 Com_drop_trigger 1
Com_show_create_trigger 0 Com_show_create_trigger 0
......
mysql-test/r/max_statement_time.result
View file @ d4e3aa4c
...@@ -87,6 +87,7 @@ SLEEP(2) ...@@ -87,6 +87,7 @@ SLEEP(2)
1 1
SHOW STATUS LIKE '%timeout%'; SHOW STATUS LIKE '%timeout%';
Variable_name Value Variable_name Value
Binlog_group_commit_trigger_timeout 0
Master_gtid_wait_timeouts 0 Master_gtid_wait_timeouts 0
Ssl_default_timeout 0 Ssl_default_timeout 0
Ssl_session_cache_timeouts 0 Ssl_session_cache_timeouts 0
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7