diff options
| author | unknown <monty@donna.mysql.fi> | 2001-04-17 14:02:28 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-04-17 14:02:28 +0300 |
| commit | 51c2a1ebb081a9dbe031e6c345ff216f882f1ac4 (patch) | |
| tree | 2feb7d4406cc5558be41ea402576222b0ff9e4fc /scripts/mysql_install_db.sh | |
| parent | 8512c526ab768c77f0023c9b4d75949a1727acaf (diff) | |
| download | mariadb-git-51c2a1ebb081a9dbe031e6c345ff216f882f1ac4.tar.gz | |
Fixed that -ldl is not used for clients
Fixed rpl000001 to handle the most common mysql-test-run ports.
configure.in:
Fixed that -ldl is not used for clients
(The old version breaked when client was compiled staticly)
mysql-test/r/rpl000001.result:
Fix to handle the most common mysql-test-run ports.
mysql-test/t/rpl000001.test:
Fix to handle the most common mysql-test-run ports.
mysys/my_alloc.c:
Extended min block a little to get faster mallocs
scripts/mysql_install_db.sh:
Fixed bug when using RPM and one had --basedir in my.cnf
sql/Makefile.am:
Add -ldl to mysqld link line
strings/ctype-ujis.c:
Remove warnings
Diffstat (limited to 'scripts/mysql_install_db.sh')
| -rw-r--r-- | scripts/mysql_install_db.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index aec9286fd9e..ee126a87b56 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -79,14 +79,17 @@ then basedir=@prefix@ bindir=@bindir@ execdir=@libexecdir@ -elif test -d "$basedir/libexec" -then +else bindir="$basedir/bin" +if test -x "$basedir/libexec/mysqld" +then execdir="$basedir/libexec" +elif test -x "@libexecdir@/mysqld" + execdir="@libexecdir@" else - bindir="$basedir/bin" execdir="$basedir/bin" fi +fi mdata=$ldata/mysql |