diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2014-03-26 22:25:38 +0100 |
| commit | 10740939eb824bbd792352f654380e258edd7675 (patch) | |
| tree | a4c68f331f0470b8bd30822de5938a6552f69738 /support-files | |
| parent | a91c59c2affdebb4b34c2c8000b0b1648d43046d (diff) | |
| parent | 44002a34e680c79c01df879b540458c2885e97e8 (diff) | |
| download | mariadb-git-10740939eb824bbd792352f654380e258edd7675.tar.gz | |
5.5 merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/compiler_warnings.supp | 1 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 5 | ||||
| -rw-r--r-- | support-files/rpm/server-prein.sh | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp index de390839704..00434d89e2a 100644 --- a/support-files/compiler_warnings.supp +++ b/support-files/compiler_warnings.supp @@ -50,6 +50,7 @@ ibuf/ibuf0ibuf.c: null argument where non-null required: 700-1000 fsp0fsp\.c: result of 32-bit shift implicitly converted to 64 bits log/log0log\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type log/log0online\.c : passing arg 1 of `atomic_add_64_nv' from incompatible pointer type +buf/buf0buf\.c : label.*loop2.* defined but not used # # Xtradb engine diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index 3eb69941551..cb55b21ca7b 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -147,7 +147,6 @@ parse_server_arguments() { datadir_set=1 ;; --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; - --socket=*) socket=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; esac done @@ -254,12 +253,10 @@ wait_for_gone () { wait_for_ready () { - test -n "$socket" && sockopt="--socket=$socket" - i=0 while test $i -ne $service_startup_timeout ; do - if $bindir/mysqladmin $sockopt ping >/dev/null 2>&1; then + if $bindir/mysqladmin ping >/dev/null 2>&1; then log_success_msg return 0 fi diff --git a/support-files/rpm/server-prein.sh b/support-files/rpm/server-prein.sh index 9194f2b0656..cf72aefb50f 100644 --- a/support-files/rpm/server-prein.sh +++ b/support-files/rpm/server-prein.sh @@ -3,6 +3,7 @@ installed=`rpm -q --whatprovides mysql-server 2> /dev/null` if [ $? -eq 0 -a -n "$installed" ]; then + installed=`echo "$installed"|sed -n -1p` vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1` version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1` myvendor='%{mysql_vendor}' |