Commit b2147e25 authored by unknown's avatar unknown
Browse files

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

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


sql/log_event.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 0f4c30de 221397cd

BUILD/compile-pentium-debug-max

+1 −1
Original line number Diff line number Diff line
@@ -8,6 +8,6 @@ c_warnings="$c_warnings $debug_extra_warnings" 
cxx_warnings="$cxx_warnings $debug_extra_warnings"

extra_configs="$pentium_configs $debug_configs"



extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl"

extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --with-vio --with-raid"



. "$path/FINISH.sh"

configure.in

+3 −3
Original line number Diff line number Diff line
@@ -1012,7 +1012,7 @@ case $SYSTEM_TYPE in 
  *darwin5*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"

      FLAGS="-traditional-cpp -DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"
@@ -1022,7 +1022,7 @@ case $SYSTEM_TYPE in 
  *darwin6*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DFN_NO_CASE_SENCE"

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"
@@ -1031,7 +1031,7 @@ case $SYSTEM_TYPE in 
  *darwin7*)

    if test "$ac_cv_prog_gcc" = "yes"

    then

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DFN_NO_CASE_SENCE"

      FLAGS="-DHAVE_DARWIN_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ"

      CFLAGS="$CFLAGS $FLAGS"

      CXXFLAGS="$CXXFLAGS $FLAGS"

      MAX_C_OPTIMIZE="-O"

include/my_sys.h

+3 −3
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ extern void pack_dirname(my_string to,const char *from); 
extern uint unpack_dirname(my_string to,const char *from);

extern uint cleanup_dirname(my_string to,const char *from);

extern uint system_filename(my_string to,const char *from);

extern my_string unpack_filename(my_string to,const char *from);

extern uint unpack_filename(my_string to,const char *from);

extern my_string intern_filename(my_string to,const char *from);

extern my_string directory_file_name(my_string dst, const char *src);

extern int pack_filename(my_string to, const char *name, size_s max_length);
@@ -682,9 +682,9 @@ extern int my_b_safe_write(IO_CACHE *info,const byte *Buffer,uint Count); 


extern int my_block_write(IO_CACHE *info, const byte *Buffer,

			  uint Count, my_off_t pos);

extern int _flush_io_cache(IO_CACHE *info, int need_append_buffer_lock);

extern int my_b_flush_io_cache(IO_CACHE *info, int need_append_buffer_lock);



#define flush_io_cache(info) _flush_io_cache((info),1)

#define flush_io_cache(info) my_b_flush_io_cache((info),1)



extern int end_io_cache(IO_CACHE *info);

extern uint my_b_fill(IO_CACHE *info);

mysql-test/install_test_db.sh

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ then 
fi



mysqld_boot=" $execdir/mysqld --no-defaults --bootstrap --skip-grant-tables \

    --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb $EXTRA_ARG"

    --basedir=$basedir --datadir=$ldata --skip-innodb --skip-bdb --skip-warnings $EXTRA_ARG"

echo "running $mysqld_boot"



if $mysqld_boot << END_OF_DATA

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -315,6 +315,8 @@ while test $# -gt 0; do 
	$ECHO "Note: you will get more meaningful output on a source distribution compiled with debugging option when running tests with --gdb option"

      fi

      DO_GDB=1

      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --gdb"

      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb"

      # This needs to be checked properly

      # USE_MANAGER=1

      USE_RUNNING_SERVER=""
@@ -1025,7 +1027,7 @@ start_slave() 


  if [ x$DO_DDD = x1 ]

  then

    $ECHO "set args $master_args" > $GDB_SLAVE_INIT

    $ECHO "set args $slave_args" > $GDB_SLAVE_INIT

    manager_launch $slave_ident ddd -display $DISPLAY --debugger \

     "gdb -x $GDB_SLAVE_INIT" $SLAVE_MYSQLD

  elif [ x$DO_GDB = x1 ]