database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Local merge of mariadb-5.5.39

Browse Source 
bzr merge -r4264 maria/5.5

Text conflict in sql/mysqld.cc
Text conflict in storage/xtradb/btr/btr0cur.c
Text conflict in storage/xtradb/buf/buf0buf.c
Text conflict in storage/xtradb/buf/buf0lru.c
Text conflict in storage/xtradb/handler/ha_innodb.cc
5 conflicts encountered.
This commit is contained in:
Nirbhay Choubey
2014-08-06 14:06:11 -04:00
parent e4e55f7968 c722e5f25f
commit ec91eea8db
294 changed files with 7871 additions and 5706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
support-files/mysql.server.sh
View File

@@ -264,6 +264,11 @@ wait_for_ready () {
if $bindir/mysqladmin ping >/dev/null 2>&1; then
log_success_msg
return 0
elif kill -0 $! 2>/dev/null ; then
: # mysqld_safe is still running
else
# mysqld_safe is no longer running, abort the wait loop
break
fi
if test -e $sst_progress_file && [ $startup_sleep -ne 10 ];then