summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <monty@tik.mysql.fi>2001-03-21 20:13:46 +0200
committerunknown <monty@tik.mysql.fi>2001-03-21 20:13:46 +0200
commit4b56b0ee43843dae2f5503718bd851f8debbd561 (patch)
tree9acce646cec7017f770114fcd46d65bd4d8e0bf9 /scripts
parent6257ee7613836c397bda6c3533ca4a114d60e045 (diff)
downloadmariadb-git-4b56b0ee43843dae2f5503718bd851f8debbd561.tar.gz
Split setup_fields to setup_tables and setup_fields
Fixed problem with UPDATE TABLE when keys wheren't always used. Docs/manual.texi: Added comment to ALTER TABLE scripts/mysql_install_db.sh: Added test for mysqld in libexec sql/ha_innobase.cc: Removed compiler warning sql/mysql_priv.h: Split setup_fields to setup_tables and setup_fields sql/sql_base.cc: Split setup_fields to setup_tables and setup_fields sql/sql_insert.cc: Split setup_fields to setup_tables and setup_fields sql/sql_load.cc: Split setup_fields to setup_tables and setup_fields sql/sql_parse.cc: Fixed missing 'mysql_info" with now clients. sql/sql_select.cc: Split setup_fields to setup_tables and setup_fields sql/sql_update.cc: Fixed problem with UPDATE TABLE when keys wheren't always used. sql/sql_yacc.yy: Small isolation change
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 25a429f764a..3dbf7c50ad3 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -79,9 +79,12 @@ then
basedir=@prefix@
bindir=@bindir@
execdir=@libexecdir@
-else
+elif test -d "$basedir/libexec"
bindir="$basedir/bin"
execdir="$basedir/libexec"
+else
+ bindir="$basedir/bin"
+ execdir="$basedir/bin"
fi
mdata=$ldata/mysql