mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Fix merge & update result file.
This commit is contained in:
@@ -3008,7 +3008,7 @@ language = $path_language
|
||||
character-sets-dir = $path_charsetsdir
|
||||
basedir = $path_my_basedir
|
||||
server_id = $server_id
|
||||
shutdown_delay = 10
|
||||
shutdown-delay = 10
|
||||
skip-stack-trace
|
||||
skip-innodb
|
||||
skip-ndbcluster
|
||||
|
||||
@@ -19,6 +19,7 @@ language VALUE
|
||||
character-sets-dir VALUE
|
||||
basedir VALUE
|
||||
server_id VALUE
|
||||
shutdown-delay VALUE
|
||||
skip-stack-trace VALUE
|
||||
skip-innodb VALUE
|
||||
skip-ndbcluster VALUE
|
||||
@@ -37,6 +38,7 @@ language VALUE
|
||||
character-sets-dir VALUE
|
||||
basedir VALUE
|
||||
server_id VALUE
|
||||
shutdown-delay VALUE
|
||||
skip-stack-trace VALUE
|
||||
skip-innodb VALUE
|
||||
skip-ndbcluster VALUE
|
||||
|
||||
Reference in New Issue
Block a user