1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00

Merge tag 'mariadb-5.5.47' into 5.5-galera

This commit is contained in:
Nirbhay Choubey
2015-12-10 13:00:08 -05:00
122 changed files with 1962 additions and 749 deletions

View File

@@ -219,7 +219,7 @@ else
fi
fi
parse_server_arguments `$print_defaults $extra_args mysqld server mysql_server mysql.server`
parse_server_arguments `$print_defaults $extra_args --mysqld mysql.server`
# wait for the pid file to disappear
wait_for_gone () {