diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-06-20 22:08:55 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-06-20 22:10:30 +0300 |
| commit | c3c4d55e7e8dc9ec35ad27c6976fc3d85d6640b3 (patch) | |
| tree | 08f1f58ceb5f57d48381fc6476456c0408901e73 /BUILD/compile-solaris-amd64 | |
| parent | a80dbe068ca650ef1f4daee2263f0bc6e7aeb0e1 (diff) | |
| download | mariadb-git-c3c4d55e7e8dc9ec35ad27c6976fc3d85d6640b3.tar.gz | |
Merge commit from 10.1:
commit 4165961d54c7047f9574982edeb55885884d27a9
Author: Sergei Golubchik <serg@mariadb.org> Fri Oct 16 02:07:06 2015
Committer: Sergei Golubchik <serg@mariadb.org> Mon Nov 16 08:55:55 2015
disable innodb on sol10-64
because buildbot config invokes BUILD/compile-solaris-amd64
with the --extra-args=--without-plugin-innodb argument, but
BUILD/compile-solaris-amd64 doesn't take arguments and doesn't
invoke configure.pl, so this extra-args is lost.
Diffstat (limited to 'BUILD/compile-solaris-amd64')
| -rwxr-xr-x | BUILD/compile-solaris-amd64 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/BUILD/compile-solaris-amd64 b/BUILD/compile-solaris-amd64 index 8b032309beb..b24c1460dc4 100755 --- a/BUILD/compile-solaris-amd64 +++ b/BUILD/compile-solaris-amd64 @@ -3,6 +3,6 @@ export LDFLAGS='-m64 -lmtmalloc -R/usr/sfw/lib/64' export CFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64' export CXXFLAGS='-mtune=i386 -D__sun -m64 -mtune=athlon64' -cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON -DWITH_ZLIB=bundled +cmake . -DCMAKE_INSTALL_PREFIX=/usr/local/mysql -DWITH_EXTRA_CHARSETS=complex -DWITH_READLINE=ON -DWITH_SSL=bundled -DWITH_MAX=ON -DWITH_EMBEDDED_SERVER=ON -DWITH_ZLIB=bundled -DPLUGIN_INNOBASE=NO gmake -j6 VERBOSE=1 |