diff options
| author | Michael Widenius <monty@askmonty.org> | 2009-10-29 02:04:56 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2009-10-29 02:04:56 +0200 |
| commit | 664fa25e0e40457f2374f4372fca9a631d039c8c (patch) | |
| tree | 2cc8d191f21e2d5f3c6677aeaa1bca0809e918ab /BUILD | |
| parent | a5637077fbb06d038a4ce5ea2c4209edbdc7ba9e (diff) | |
| download | mariadb-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 'BUILD')
| -rwxr-xr-x | BUILD/SETUP.sh | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 418ee799a2c..30148cde360 100755 --- a/BUILD/SETUP.sh +++ b/BUILD/SETUP.sh @@ -146,6 +146,13 @@ then debug_cflags="$debug_cflags $debug_extra_cflags" fi +static_link="--with-mysqld-ldflags=-all-static " +static_link="$static_link --with-client-ldflags=-all-static" +# we need local-infile in all binaries for rpl000001 +# if you need to disable local-infile in the client, write a build script +# and unset local_infile_configs +local_infile_configs="--enable-local-infile" + # # Configuration options. # @@ -154,6 +161,8 @@ base_configs="$base_configs --with-extra-charsets=complex " base_configs="$base_configs --enable-thread-safe-client " base_configs="$base_configs --with-big-tables" base_configs="$base_configs --with-plugin-maria --with-maria-tmp-tables --without-plugin-innodb_plugin" +# Compile our client programs with static libraries to allow them to be moved +base_configs="$base_configs --with-mysqld-ldflags=-static --with-client-ldflags=-static" if test -d "$path/../cmd-line-utils/readline" then @@ -163,14 +172,6 @@ then base_configs="$base_configs --with-libedit" fi -static_link="--with-mysqld-ldflags=-all-static " -static_link="$static_link --with-client-ldflags=-all-static" -# we need local-infile in all binaries for rpl000001 -# if you need to disable local-infile in the client, write a build script -# and unset local_infile_configs -local_infile_configs="--enable-local-infile" - - max_no_embedded_configs="$SSL_LIBRARY --with-plugins=max" max_no_qc_configs="$SSL_LIBRARY --with-plugins=max --without-query-cache" max_no_ndb_configs="$SSL_LIBRARY --with-plugins=max-no-ndb --with-embedded-server --with-libevent" |