← Back to branch summary

~codership/galera/2.x

« back to all changes in this revision

Viewing changes to scripts/mysql/mysql-galera

  • Committer: Alexey Yurchenko
  • Date: 2014-01-29 14:43:26 UTC
  • mto: This revision was merged to the branch mainline in revision 167.
  • Revision ID: alexey.yurchenko@codership.com-20140129144326-aa70nhzofl0smkm8
https://launchpad.net/bugs/1099478
https://launchpad.net/bugs/1259952
https://launchpad.net/bugs/1261996
https://launchpad.net/bugs/1232747
Fixes:
* provider pause() is fixed to avoid potential deadlock with replicating threads.
* lp:1099478 - handle own address in the address list properly (do not throw exception)
* lp:1259952 - fixed allocation of multiple of pages when posix_fallocate() is unavailable
* lp:1261996 - fixed compilation on Solaris 11
* lp:1232747 - fixed group remerge after partitioning event

Synced with SVN r3450

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/mysql/mysql-galera
69
69
MYSQL_PORT=${MYSQL_PORT:-3306}
70
70
MYSQL_SOCKET=${MYSQL_SOCKET:-"$MYSQL_DATA_DIR/mysqld.sock"}
71
71
MYSQL_PID=${MYSQL_PID:-"$MYSQL_DATA_DIR/mysqld.pid"}
 
72
# Startup wait timeout.
 
73
MYSQL_STARTUP_WAIT=${MYSQL_STARTUP_WAIT:-1}
72
74
# Shutdown wait timeout.
73
75
MYSQL_SHUTDOWN_WAIT=60
74
76
#============= Nothing servicable below ================================
328
330
            --socket=$MYSQL_SOCKET \
329
331
            --skip-external-locking \
330
332
            --log_error=$err_log \
331
 
            $MYSQLD_OPTS \
332
333
            $INNODB_OPTS \
333
334
            $WSREP_OPTS \
334
335
            $DEBUG_OPTS \
336
337
            $RBR_OPTS \
337
338
            $PLUGIN_OPTS \
338
339
            $wsrep_start_position_opt \
 
340
            $MYSQLD_OPTS \
339
341
            1>/dev/null 2>>$err_log &
340
342
    else
341
343
        $GDB --args $MYSQLD \
349
351
            --socket=$MYSQL_SOCKET \
350
352
            --skip-external-locking \
351
353
            --log_error=$err_log \
352
 
            $MYSQLD_OPTS \
353
354
            $INNODB_OPTS \
354
355
            $WSREP_OPTS \
355
356
            $DEBUG_OPTS \
356
357
            $LOGGING_OPTS \
357
358
            $RBR_OPTS \
358
359
            $PLUGIN_OPTS \
359
 
            $wsrep_start_position_opt
 
360
            $wsrep_start_position_opt \
 
361
            $MYSQLD_OPTS
360
362
    fi
361
363
    my_pid=$!
362
364
    [ "$OS" == "Darwin" ] && export -n LD_LIBRARY_PATH
363
365
 
364
366
#    echo "Waiting for pid file"
 
367
    second=0
365
368
    while ! test -r $MYSQL_PID
366
369
    do
367
370
        sleep 1
 
371
        second=$(($second + 1))
368
372
        if find_pid $my_pid
369
373
        then
370
374
            # process is alive, wait for pid file
371
375
            echo -n "."
 
376
        elif test $second -lt $MYSQL_STARTUP_WAIT
 
377
        then
 
378
            # process is not yet alive, wait for it to start
 
379
            echo -n "."
372
380
        else
373
381
            failed="yes"
374
382
            break