After-merge fixes: .result file update

This commit is contained in:
Kristian Nielsen 2015-04-20 14:23:55 +02:00
parent a15a4d674d
commit d4e3aa4c6f
2 changed files with 4 additions and 0 deletions

View file

@ -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

View file

@ -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