Skip to content

M
MariaDB
Commit 50e5958f authored by anozdrin/alik@alik.opbmk's avatar anozdrin/alik@alik.opbmk
Browse files
Options

Fix merge & update result file.

parent fe585401
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
mysql-test/mysql-test-run.pl
View file @ 50e5958f
...@@ -3008,7 +3008,7 @@ language = $path_language ...@@ -3008,7 +3008,7 @@ language = $path_language
character-sets-dir = $path_charsetsdir character-sets-dir = $path_charsetsdir
basedir = $path_my_basedir basedir = $path_my_basedir
server_id = $server_id server_id = $server_id
shutdown_delay = 10 shutdown-delay = 10
skip-stack-trace skip-stack-trace
skip-innodb skip-innodb
skip-ndbcluster skip-ndbcluster
......
mysql-test/r/im_utils.result
View file @ 50e5958f
...@@ -19,6 +19,7 @@ language VALUE ...@@ -19,6 +19,7 @@ language VALUE
character-sets-dir VALUE character-sets-dir VALUE
basedir VALUE basedir VALUE
server_id VALUE server_id VALUE
shutdown-delay VALUE
skip-stack-trace VALUE skip-stack-trace VALUE
skip-innodb VALUE skip-innodb VALUE
skip-ndbcluster VALUE skip-ndbcluster VALUE
...@@ -37,6 +38,7 @@ language VALUE ...@@ -37,6 +38,7 @@ language VALUE
character-sets-dir VALUE character-sets-dir VALUE
basedir VALUE basedir VALUE
server_id VALUE server_id VALUE
shutdown-delay VALUE
skip-stack-trace VALUE skip-stack-trace VALUE
skip-innodb VALUE skip-innodb VALUE
skip-ndbcluster VALUE skip-ndbcluster VALUE
......
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