At http://bazaar.launchpad.net/~maria-captains/maria/5.1/ ------------------------------------------------------------ revno: 2897 revision-id: sergii@pisem.net-20100810143604-zt0d174fb06vrsrj parent: monty@mysql.com-20100809170542-ewa2awm6pcoi1ipy committer: Sergei Golubchik <sergii@pisem.net> branch nick: 5.1 timestamp: Tue 2010-08-10 18:36:04 +0400 message: created *-all build scripts that build with ndb (as -max scripts don't) === modified file 'BUILD/SETUP.sh' --- a/BUILD/SETUP.sh 2010-08-02 09:01:24 +0000 +++ b/BUILD/SETUP.sh 2010-08-10 14:36:04 +0000 @@ -91,8 +91,8 @@ path=`dirname $0` get_make_parallel_flag # SSL library to use.--with-ssl will select our bundled yaSSL -# implementation of SSL. To use openSSl you will nee too point out -# the location of openSSL headers and lbs on your system. +# implementation of SSL. To use OpenSSL you will need to specify +# the location of OpenSSL headers and libs on your system. # Ex --with-ssl=/usr SSL_LIBRARY=--with-ssl @@ -182,8 +182,7 @@ max_no_embedded_configs="$SSL_LIBRARY -- 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" max_configs="$SSL_LIBRARY --with-plugins=max --with-embedded-server --with-libevent" -# Disable NDB in maria max builds -max_configs=$max_no_ndb_configs +all_configs="$SSL_LIBRARY --with-plugins=max --with-plugin-ndbcluster --with-embedded-server --with-libevent" # # CPU and platform specific compilation flags. === added file 'BUILD/compile-amd64-debug-all' --- a/BUILD/compile-amd64-debug-all 1970-01-01 00:00:00 +0000 +++ b/BUILD/compile-amd64-debug-all 2010-08-10 14:36:04 +0000 @@ -0,0 +1,7 @@ +#! /bin/sh +path=`dirname $0` +. "$path/SETUP.sh" +extra_flags="$amd64_cflags $debug_cflags" +extra_configs="$amd64_configs $debug_configs $all_configs" + +. "$path/FINISH.sh" === added file 'BUILD/compile-pentium-debug-all' --- a/BUILD/compile-pentium-debug-all 1970-01-01 00:00:00 +0000 +++ b/BUILD/compile-pentium-debug-all 2010-08-10 14:36:04 +0000 @@ -0,0 +1,10 @@ +#! /bin/sh + +path=`dirname $0` +set -- "$@" --with-debug=full +. "$path/SETUP.sh" + +extra_flags="$pentium_cflags $debug_cflags" +extra_configs="$pentium_configs $debug_configs $all_configs $error_inject --with-experimental-collations" + +. "$path/FINISH.sh" === added file 'BUILD/compile-pentium64-debug-all' --- a/BUILD/compile-pentium64-debug-all 1970-01-01 00:00:00 +0000 +++ b/BUILD/compile-pentium64-debug-all 2010-08-10 14:36:04 +0000 @@ -0,0 +1,12 @@ +#! /bin/sh + +path=`dirname $0` +set -- "$@" --with-debug=full +. "$path/SETUP.sh" + +extra_flags="$pentium64_cflags $debug_cflags" +extra_configs="$pentium_configs $debug_configs $all_configs" + +extra_configs="$extra_configs " +CC="$CC --pipe" +. "$path/FINISH.sh" === modified file 'mysql-test/mysql-test-run.pl' --- a/mysql-test/mysql-test-run.pl 2010-08-09 17:05:42 +0000 +++ b/mysql-test/mysql-test-run.pl 2010-08-10 14:36:04 +0000 @@ -4038,6 +4038,7 @@ sub extract_warning_lines ($) { qr/unknown variable 'loose-/, qr/Now setting lower_case_table_names to [02]/, qr/Setting lower_case_table_names=2/, + qr/Plugin 'ndbcluster' will be forced to shutdow/, qr/deprecated/, qr/Slave SQL thread retried transaction/, qr/Slave \(additional info\)/,