database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix merge & update result file.

Browse Source 
mysql-test/mysql-test-run.pl:
  Fix merge.
mysql-test/r/im_utils.result:
  Updated result file.
This commit is contained in:
unknown
2007-02-23 23:36:25 +03:00
parent 4f4de12237
commit 4acc8e9d2b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

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

2
mysql-test/r/im_utils.result
View File

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