Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
d4e3aa4c
Commit
d4e3aa4c
authored
Apr 20, 2015
by
Kristian Nielsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
After-merge fixes: .result file update
parent
a15a4d67
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
mysql-test/r/features.result
mysql-test/r/features.result
+3
-0
mysql-test/r/max_statement_time.result
mysql-test/r/max_statement_time.result
+1
-0
No files found.
mysql-test/r/features.result
View file @
d4e3aa4c
...
...
@@ -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
...
...
mysql-test/r/max_statement_time.result
View file @
d4e3aa4c
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment