1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge alik.opbmk:/mnt/raid/alik/MySQL/devel/5.0-rt-build

into  alik.opbmk:/mnt/raid/alik/MySQL/devel/5.1-rt-build


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/im_daemon_life_cycle.result:
  Merged.
This commit is contained in:
unknown
2007-02-23 21:55:14 +03:00
2 changed files with 2 additions and 2 deletions

View File

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