Commit 4acc8e9d authored by unknown's avatar unknown
Browse files

Fix merge & update result file. 


mysql-test/mysql-test-run.pl:
  Fix merge.
mysql-test/r/im_utils.result:
  Updated result file.
parent 4f4de122

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -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

mysql-test/r/im_utils.result

+2 −0
Original line number Diff line number Diff line
@@ -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