diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-18 15:16:27 +0100 |
| commit | d7e7862364ae344fea5657eb5aae9db3fbb84553 (patch) | |
| tree | 38f30e541f98dae9092a09cf030de8f2a336bfd1 /support-files | |
| parent | a06624d61f36c70edd63adcfe2803bb7a8564de5 (diff) | |
| parent | fdd6c111c254c5044cd9b6c2f7e4d0c74f427a79 (diff) | |
| download | mariadb-git-d7e7862364ae344fea5657eb5aae9db3fbb84553.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'support-files')
| -rwxr-xr-x | support-files/build-tags | 4 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/support-files/build-tags b/support-files/build-tags index 44bd2a02593..4b76e01907a 100755 --- a/support-files/build-tags +++ b/support-files/build-tags @@ -1,9 +1,9 @@ #! /bin/sh rm -f TAGS -filter='\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.ic$\|errmsg-utf8\.txt$' +filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$\|errmsg-utf8\.txt$' list="find . -type f" -bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned" +git rev-parse >/dev/null 2>/dev/null && list="git ls-files" $list |grep $filter | xargs etags -o TAGS --append diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index a19f09fc91f..e23b8373ec4 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -146,6 +146,9 @@ parse_server_arguments() { --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` datadir_set=1 ;; + --log-basename=*|--hostname=*|--loose-log-basename=*) + mysqld_pid_file_path=`echo "$arg.pid" | sed -e 's/^[^=]*=//'` + ;; --pid-file=*) mysqld_pid_file_path=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; --service-startup-timeout=*) service_startup_timeout=`echo "$arg" | sed -e 's/^[^=]*=//'` ;; esac |