diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-19 23:27:10 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 00:55:20 +0100 |
| commit | 8f1014e9a0b41c3893f4b15b9db4842d816d9f3f (patch) | |
| tree | 65a5e7447664a9b55ffc472309f979b2de444aa5 /scripts | |
| parent | 7e300424a39f8b99ef73e037861f454268ba6fe7 (diff) | |
| download | mariadb-git-8f1014e9a0b41c3893f4b15b9db4842d816d9f3f.tar.gz | |
MDEV-15409 make sure every sst script is tested in buildbot
fix galera.galera_sst_mysqldump test to work:
* must connect to 127.0.0.1, where mysqld is listening
* disable wsrep_sync_wait in wsrep_sst_mysqldump, otherwise
sst can deadlock
* allow 127.0.0.1 for bind_address and wsrep_sst_receive_address.
(it's useful in tests, or when two nodes are on the same box,
or when nodes are on different boxes, but the connection is
tunelled, or whatever. Don't judge user's setup). MDEV-14070
* don't wait for client connections to die when doing
mysqldump sst. they'll die in a due time, and if needed mysql
will wait on locks until they do. MDEV-14069
Also don't mark it big, to make sure it's sufficiently tested
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 358247359e6..46edefd4829 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -119,11 +119,11 @@ MYSQL="$MYSQL_CLIENT $WSREP_SST_OPT_CONF "\ # Check if binary logging is enabled on the joiner node. # Note: SELECT cannot be used at this point. -LOG_BIN=$(echo "SHOW VARIABLES LIKE 'log_bin'" | $MYSQL |\ +LOG_BIN=$(echo "set statement wsrep_sync_wait=0 for SHOW VARIABLES LIKE 'log_bin'" | $MYSQL |\ tail -1 | awk -F ' ' '{ print $2 }') # Check the joiner node's server version. -SERVER_VERSION=$(echo "SHOW VARIABLES LIKE 'version'" | $MYSQL |\ +SERVER_VERSION=$(echo "set statement wsrep_sync_wait=0 for SHOW VARIABLES LIKE 'version'" | $MYSQL |\ tail -1 | awk -F ' ' '{ print $2 }') RESET_MASTER="" |