Commit c0af1e3c authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/my/mysql-4.1


sql/sql_parse.cc:
  Auto merged
parents 28b783ea 85a6647f

Build-tools/Do-compile

+14 −14
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ $opt_distribution=$opt_user=$opt_config_env=$opt_config_extra_env=""; 
$opt_dbd_options=$opt_perl_options=$opt_config_options=$opt_make_options=$opt_suffix="";

$opt_tmp=$opt_version_suffix="";

$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;

$opt_embedded_test=$opt_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;

$opt_skip_embedded_test=$opt_skip_ps_test=$opt_innodb=$opt_bdb=$opt_raid=$opt_libwrap=$opt_clearlogs=0;



GetOptions(

	"bdb",
@@ -25,7 +25,6 @@ GetOptions( 
	"delete",

	"distribution=s",

	"enable-shared",

	"embedded-test",

	"fast-benchmark",

	"help|Information",

	"innodb",
@@ -41,9 +40,10 @@ GetOptions( 
	"one-error",

	"perl-files=s",

	"perl-options=s",

 	"ps-test",

	"raid",

	"readline",

	"skip-embedded-test",

 	"skip-ps-test",

	"stage=i",

	"static-client",

	"static-perl",
@@ -278,7 +278,7 @@ if ($opt_stage <= 1) 
		$opt_config_options.= " --with-libedit";

	}

  $opt_config_options.= " --with-embedded-server" unless ($opt_without_embedded);

  $opt_embedded_test= 0 if ($opt_without_embedded);

  $opt_skip_embedded_test= 1 if ($opt_without_embedded);

  $opt_config_options.= " --with-archive-storage-engine" if ($opt_with_archive);

  $opt_config_options.= " --with-ndbcluster" if ($opt_with_cluster);

  $opt_config_options.= " --with-csv-storage-engine" if ($opt_with_csv);
@@ -391,14 +391,14 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest) 
  safe_cd("${test_dir}/mysql-test");

  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");



  if ($opt_ps_test)

  unless ($opt_skip_ps_test)

  {

    log_timestamp();

    info("Running test suite using prepared statements");

    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");

  }

  

  if ($opt_embedded_test)

  unless ($opt_skip_embedded_test)

  {

    log_timestamp();

    info("Running embedded server test suite");
@@ -551,9 +551,6 @@ Delete the distribution file. 
--distribution=<distribution_file>

Name of the MySQL source distribution file.



--embedded-test

Run the test suite against the embedded server



--enable-shared

Compile with shared libraries
@@ -602,15 +599,18 @@ Compile and install the given perl modules. 
--perl-options=<options>

Build Perl modules with the additional options



--ps-test

Run an additional test run, using prepared statements



--raid

Compile with RAID support



--readline

Compile against readline library instead of libedit



--skip-embedded-test

Skip running the test suite against the embedded server



--skip-ps-test

Skip running the additional test run that uses the prepared statement protocol



--stage=[1-6]

Start script from some specific point.

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 4.1.9)

AM_INIT_AUTOMAKE(mysql, 4.1.10)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

libmysql/libmysql.def

+1 −0
Original line number Diff line number Diff line
@@ -146,3 +146,4 @@ EXPORTS 
	mysql_rpl_query_type

	mysql_slave_query

	mysql_embedded

	get_defaults_files

libmysql_r/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


target = libmysqlclient_r.la

target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@

LIBS = @LIBS@ @openssl_libs@

LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@



INCLUDES = @MT_INCLUDES@ \

	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@

libmysqld/libmysqld.def

+1 −0
Original line number Diff line number Diff line
@@ -157,3 +157,4 @@ EXPORTS 
	mysql_stmt_attr_get

	mysql_stmt_attr_set

	mysql_stmt_field_count

	get_defaults_files