@@ -10,8 +10,8 @@ use Sys::Hostname;
1010$opt_distribution =$opt_user =$opt_config_env =$opt_config_extra_env =" "
1111$opt_dbd_options =$opt_perl_options =$opt_config_options =$opt_make_options =$opt_suffix =" "
1212$opt_tmp =$opt_version_suffix =" "
13- $opt_bundled_zlib =$opt_help =$opt_delete =$opt_debug =$opt_stage =$opt_no_test =$opt_no_perl =$opt_one_error =$opt_with_low_memory =$opt_fast_benchmark =$opt_static_client =$opt_static_server =$opt_static_perl =$opt_sur =$opt_with_small_disk =$opt_local_perl =$opt_tcpip =$opt_build_thread =$opt_use_old_distribution =$opt_enable_shared =$opt_no_crash_me =$opt_no_strip =$opt_with_archive =$opt_with_cluster =$opt_with_debug =$opt_no_benchmark =$opt_no_mysqltest =$opt_without_embedded =$opt_readline =0;
14- $opt_innodb =$opt_bdb =$opt_raid =$opt_libwrap =$opt_clearlogs =0;
13+ $opt_bundled_zlib =$opt_help =$opt_delete =$opt_debug =$opt_stage =$opt_no_test =$opt_no_perl =$opt_one_error =$opt_with_low_memory =$opt_fast_benchmark =$opt_static_client =$opt_static_server =$opt_static_perl =$opt_sur =$opt_with_small_disk =$opt_local_perl =$opt_tcpip =$opt_build_thread =$opt_use_old_distribution =$opt_enable_shared =$opt_no_crash_me =$opt_no_strip =$opt_with_archive =$opt_with_cluster =$opt_with_csv = $opt_with_example = $ opt_with_debug$opt_no_benchmark =$opt_no_mysqltest =$opt_without_embedded =$opt_readline =0;
14+ $opt_embedded_test = $opt_ps_test = $ opt_innodb$opt_bdb =$opt_raid =$opt_libwrap =$opt_clearlogs =0;
1515
1616GetOptions(
1717 " bdb"
@@ -25,6 +25,7 @@ GetOptions(
2525 " delete"
2626 " distribution=s"
2727 " enable-shared"
28+ " embedded-test"
2829 " fast-benchmark"
2930 " help|Information"
3031 " innodb"
@@ -40,6 +41,7 @@ GetOptions(
4041 " one-error"
4142 " perl-files=s"
4243 " perl-options=s"
44+ " ps-test"
4345 " raid"
4446 " readline"
4547 " stage=i"
@@ -55,6 +57,8 @@ GetOptions(
5557 " version-suffix=s"
5658 " with-archive"
5759 " with-cluster"
60+ " with-csv"
61+ " with-example"
5862 " with-debug"
5963 " with-low-memory"
6064 " with-other-libc=s"
@@ -274,8 +278,11 @@ if ($opt_stage <= 1)
274278 $opt_config_options .= " --with-libedit"
275279 }
276280 $opt_config_options .= " --with-embedded-server" unless ($opt_without_embedded );
281+ $opt_embedded_test = 0 if ($opt_without_embedded );
277282 $opt_config_options .= " --with-archive-storage-engine" if ($opt_with_archive );
278283 $opt_config_options .= " --with-ndbcluster" if ($opt_with_cluster );
284+ $opt_config_options .= " --with-csv-storage-engine" if ($opt_with_csv );
285+ $opt_config_options .= " --with-example-storage-engine" if ($opt_with_example );
279286
280287 # Only enable InnoDB when requested (required to be able to
281288 # build the "Classic" packages that do not include InnoDB)
@@ -376,13 +383,29 @@ $ENV{"LD_LIBRARY_PATH"}= ("$test_dir/lib" .
376383if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest )
377384{
378385 my $flags = " "
379- my $force = " "
380386 $flags .= " --with-ndbcluster" if ($opt_with_cluster );
381387 $flags .= " --force" if (!$opt_one_error );
382388 log_timestamp();
389+ info(" Running test suite"
383390 system (" mkdir $bench_tmpdir " if (! -d $bench_tmpdir );
384391 safe_cd(" ${test_dir} /mysql-test"
385392 check_system(" ./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10" " tests were successful"
393+
394+ if ($opt_ps_test )
395+ {
396+ log_timestamp();
397+ info(" Running test suite using prepared statements"
398+ check_system(" ./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10" " tests were successful"
399+ }
400+
401+ if ($opt_embedded_test )
402+ {
403+ log_timestamp();
404+ info(" Running embedded server test suite"
405+ # Embedded server and NDB don't jive
406+ $flags =~ s ///
407+ check_system(" ./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10" " tests were successful"
408+ }
386409 # 'mysql-test-run' writes its own final message for log evaluation.
387410}
388411
@@ -528,6 +551,9 @@ Delete the distribution file.
528551--distribution=<distribution_file>
529552Name of the MySQL source distribution file.
530553
554+ --embedded-test
555+ Run the test suite against the embedded server
556+
531557--enable-shared
532558Compile with shared libraries
533559
@@ -576,6 +602,9 @@ Compile and install the given perl modules.
576602--perl-options=<options>
577603Build Perl modules with the additional options
578604
605+ --ps-test
606+ Run an additional test run, using prepared statements
607+
579608--raid
580609Compile with RAID support
581610
@@ -612,11 +641,17 @@ If user is empty then no mail is sent.
612641Set name suffix (e.g. 'com' or '-max') for a distribution
613642
614643--with archive
615- Enable the Archive storage Engine
644+ Enable the Archive storage engine
616645
617646--with cluster
618647Compile and test with NDB Cluster enabled
619648
649+ --with-csv
650+ Enable the CSV storage engine
651+
652+ --with-example
653+ Enable the Example storage engine
654+
620655--with-debug
621656Build binaries with debug information (implies "--no-strip")
622657
0 commit comments