summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2009-10-29 02:04:56 +0200
committerMichael Widenius <monty@askmonty.org>2009-10-29 02:04:56 +0200
commit664fa25e0e40457f2374f4372fca9a631d039c8c (patch)
tree2cc8d191f21e2d5f3c6677aeaa1bca0809e918ab /scripts
parenta5637077fbb06d038a4ce5ea2c4209edbdc7ba9e (diff)
downloadmariadb-git-664fa25e0e40457f2374f4372fca9a631d039c8c.tar.gz
Compile by default MySQL clients with libmysqldclient.a (not .so)
This makes them suitable for tar archices right away and also are easier to copy Don't disable federated storage engine by default. Don't allow one to disable the Maria storage engine if it's used for temp tables BUILD/SETUP.sh: Compile by default MySQL clients with libmysqldclient.a (not .so) This makes them suitable for tar archices right away and also are easier to copy scripts/make_binary_distribution.sh: Abort it clients are compiled with the shared libmysqlclient.so library sql/mysqld.cc: Don't call kill_mysql() if signal handler is not setup (causes a core dump). This is only relevant when starting with --gdb. sql/sql_plugin.cc: Don't disable federated storage engine by default. Don't allow one to disable the Maria storage engine if it's used for temp tables
Diffstat (limited to 'scripts')
-rw-r--r--scripts/make_binary_distribution.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/scripts/make_binary_distribution.sh b/scripts/make_binary_distribution.sh
index 9595a56ef62..3e156dd668d 100644
--- a/scripts/make_binary_distribution.sh
+++ b/scripts/make_binary_distribution.sh
@@ -231,6 +231,18 @@ if [ x"$BASE_SYSTEM" != x"netware" ] ; then
# ----------------------------------------------------------------------
set -e
+ #
+ # Check that the client is compiled with libmysqlclient.a
+ #
+ if test -f ./client/.libs/mysql
+ then
+ echo ""
+ echo "The MySQL clients are compiled dynamicly, which is not allowed for"
+ echo "a MySQL binary tar file. Please configure with"
+ echo "--with-client-ldflags=-all-static and try again"
+ exit 1;
+ fi
+
# ----------------------------------------------------------------------
# Really ugly, one script, "mysql_install_db", needs prefix set to ".",
# i.e. makes access relative the current directory. This matches