diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-10-23 22:26:26 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-10-23 22:26:26 +0300 |
| commit | b9ea90b0640317295cbd50c826d319e26c73480f (patch) | |
| tree | bdefff10d2b087b911f764afbcc5667d99f713d0 /support-files | |
| parent | b9f5aba8e44f8790366b51f98eec819f10ef65ab (diff) | |
| parent | afd0a45639279c8de44f1358cc83c1f1b76ebb30 (diff) | |
| download | mariadb-git-b9ea90b0640317295cbd50c826d319e26c73480f.tar.gz | |
Automatic merge
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/Makefile.am | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | support-files/config.huge.ini.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | support-files/config.medium.ini.sh | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | support-files/config.small.ini.sh | 0 | ||||
| -rw-r--r-- | support-files/mysql.server.sh | 13 |
5 files changed, 15 insertions, 2 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am index 77eddea3227..52e3ed5d854 100644 --- a/support-files/Makefile.am +++ b/support-files/Makefile.am @@ -53,7 +53,9 @@ pkgsupp_DATA = my-small.cnf \ ndb-config-2-node.ini pkgsupp_SCRIPTS = mysql.server \ - mysqld_multi.server + mysqld_multi.server \ + binary-configure \ + mysql-log-rotate aclocaldir = $(datadir)/aclocal aclocal_DATA = mysql.m4 diff --git a/support-files/config.huge.ini.sh b/support-files/config.huge.ini.sh index 938dd3209b8..938dd3209b8 100755..100644 --- a/support-files/config.huge.ini.sh +++ b/support-files/config.huge.ini.sh diff --git a/support-files/config.medium.ini.sh b/support-files/config.medium.ini.sh index e35dd35e455..e35dd35e455 100755..100644 --- a/support-files/config.medium.ini.sh +++ b/support-files/config.medium.ini.sh diff --git a/support-files/config.small.ini.sh b/support-files/config.small.ini.sh index 129e2521e17..129e2521e17 100755..100644 --- a/support-files/config.small.ini.sh +++ b/support-files/config.small.ini.sh diff --git a/support-files/mysql.server.sh b/support-files/mysql.server.sh index fe885122e8c..d8725b98ca5 100644 --- a/support-files/mysql.server.sh +++ b/support-files/mysql.server.sh @@ -77,7 +77,12 @@ else datadir="$basedir/data" fi sbindir="$basedir/sbin" - libexecdir="$basedir/libexec" + if test -f "$basedir/bin/mysqld" + then + libexecdir="$basedir/bin" + else + libexecdir="$basedir/libexec" + fi fi # datadir_set is used to determine if datadir was set (and so should be @@ -126,6 +131,12 @@ parse_server_arguments() { datadir="$basedir/data" fi sbindir="$basedir/sbin" + if test -f "$basedir/bin/mysqld" + then + libexecdir="$basedir/bin" + else + libexecdir="$basedir/libexec" + fi libexecdir="$basedir/libexec" ;; --datadir=*) datadir=`echo "$arg" | sed -e 's/^[^=]*=//'` |