Commit c07407d1 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0
parents 00d7c5f4 b10c7d60

config/ac-macros/zlib.m4

+3 −2
Original line number Diff line number Diff line
@@ -89,8 +89,9 @@ case $SYSTEM_TYPE in 
        fi

        ;;

      *)

        if test -f "$mysql_zlib_dir/lib/libz.a" -a \ 

                -f "$mysql_zlib_dir/include/zlib.h"; then

        if test \( -f "$mysql_zlib_dir/lib/libz.a"  -o -f "$mysql_zlib_dir/lib/libz.so" -o \

                   -f "$mysql_zlib_dir/lib/libz.sl" -o -f "$mysql_zlib_dir/lib/libz.dylib" \) \

                -a -f "$mysql_zlib_dir/include/zlib.h"; then

          ZLIB_INCLUDES="-I$mysql_zlib_dir/include"

          ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"

          MYSQL_CHECK_ZLIB_DIR

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,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, 5.0.16)

AM_INIT_AUTOMAKE(mysql, 5.0.17)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -18,7 +18,7 @@ SHARED_LIB_VERSION=15:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=16

NDB_VERSION_BUILD=17

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

mysql-test/mysql-test-run.pl

+2 −2
Original line number Diff line number Diff line
@@ -2008,7 +2008,7 @@ sub mysqld_arguments ($$$$$) { 
  mtr_add_arg($args, "%s--basedir=%s", $prefix, $path_my_basedir);

  mtr_add_arg($args, "%s--character-sets-dir=%s", $prefix, $path_charsetsdir);

  mtr_add_arg($args, "%s--core", $prefix);

  mtr_add_arg($args, "%s--log-bin-trust-routine-creators", $prefix);

  mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);

  mtr_add_arg($args, "%s--default-character-set=latin1", $prefix);

  mtr_add_arg($args, "%s--language=%s", $prefix, $path_language);

  mtr_add_arg($args, "%s--tmpdir=$opt_tmpdir", $prefix);
@@ -2131,7 +2131,7 @@ sub mysqld_arguments ($$$$$) { 
  mtr_add_arg($args, "%s--key_buffer_size=1M", $prefix);

  mtr_add_arg($args, "%s--sort_buffer=256K", $prefix);

  mtr_add_arg($args, "%s--max_heap_table_size=1M", $prefix);

  mtr_add_arg($args, "%s--log-bin-trust-routine-creators", $prefix);

  mtr_add_arg($args, "%s--log-bin-trust-function-creators", $prefix);



  if ( $opt_ssl_supported )

  {

mysql-test/mysql-test-run.sh

+3 −3
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ start_master() 
          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:128M:autoextend \

	  --open-files-limit=1024 \

          --log-bin-trust-routine-creators \

          --log-bin-trust-function-creators \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
@@ -1296,7 +1296,7 @@ start_master() 
          --tmpdir=$MYSQL_TMP_DIR \

          --language=$LANGUAGE \

          --innodb_data_file_path=ibdata1:128M:autoextend \

          --log-bin-trust-routine-creators \

          --log-bin-trust-function-creators \

	   $MASTER_40_ARGS \

           $SMALL_SERVER \

           $EXTRA_MASTER_OPT $EXTRA_MASTER_MYSQLD_OPT \
@@ -1429,7 +1429,7 @@ start_slave() 
          --report-port=$slave_port \

          --master-retry-count=10 \

          -O slave_net_timeout=10 \

          --log-bin-trust-routine-creators \

          --log-bin-trust-function-creators \

           $SMALL_SERVER \

           $EXTRA_SLAVE_OPT $EXTRA_SLAVE_MYSQLD_OPT"

  CUR_MYERR=$slave_err

mysql-test/mysql_test_run_new.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ void start_master() 
#endif

  add_arg(&al, "--local-infile");

  add_arg(&al, "--core");

  add_arg(&al, "--log-bin-trust-routine-creators");

  add_arg(&al, "--log-bin-trust-function-creators");

  add_arg(&al, "--datadir=%s", master_dir);

#ifndef __WIN__

  add_arg(&al, "--pid-file=%s", master_pid);