Commit 74214b86 authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge


configure.in:
  Auto merged
man/Makefile.am:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/sql_locale.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
parents 3c9ba020 04d60b38

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2339,12 +2339,16 @@ then 
  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  man1_files=`echo $man1_files`

  man8_files=`ls -8 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  man8_files=`echo $man8_files`

else

  man_dirs=""

  man1_files=""

  man8_files=""

fi

AC_SUBST(man_dirs)

AC_SUBST(man1_files)

AC_SUBST(man8_files)



# Shall we build the bench code?

AC_ARG_WITH(bench,

man/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
## Process this file with automake to create Makefile.in



man1_MANS =   @man1_files@

EXTRA_DIST =  $(man1_MANS)

man8_MANS =   @man8_files@

EXTRA_DIST =  $(man1_MANS) $(man8_MANS)



# Don't update the files from bitkeeper

%::SCCS/s.%

mysql-test/t/mysqlbinlog.test

+5 −5
Original line number Diff line number Diff line
@@ -49,14 +49,14 @@ select "--- Local --" as ""; 
select "--- Broken LOAD DATA --" as "";

--enable_query_log

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000002

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ $MYSQLTEST_VARDIR/log/master-bin.000002 2> /dev/null



# this should show almost nothing

--disable_query_log

select "--- --database --" as "";

--enable_query_log

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --database=nottest $MYSQLTEST_VARDIR/log/master-bin.000001 2> /dev/null



# this test for position option

--disable_query_log
@@ -81,14 +81,14 @@ select "--- Remote --" as ""; 
select "--- Broken LOAD DATA --" as "";

--enable_query_log

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT master-bin.000002 2> /dev/null



# And this too ! (altough it is documented)

--disable_query_log

select "--- --database --" as "";

--enable_query_log

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001

--exec $MYSQL_BINLOG --short-form --local-load=$MYSQLTEST_VARDIR/tmp/ --read-from-remote-server --user=root --host=127.0.0.1 --port=$MASTER_MYPORT --database=nottest master-bin.000001 2> /dev/null



# Strangely but this works

--disable_query_log

mysys/my_bitmap.c

+1 −1
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ uint bitmap_set_next(MY_BITMAP *map) 
{

  uchar *bitmap=map->bitmap;

  uint bit_found = MY_BIT_NONE;

  uint bitmap_size=map->bitmap_size*8;

  uint bitmap_size=map->bitmap_size;

  uint i;



  DBUG_ASSERT(map->bitmap);

scripts/make_binary_distribution.sh

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ mkdir $BASE $BASE/bin $BASE/docs \ 


if [ $BASE_SYSTEM != "netware" ] ; then

 mkdir $BASE/share/mysql $BASE/tests $BASE/sql-bench $BASE/man \

  $BASE/man/man1 $BASE/data $BASE/data/mysql $BASE/data/test

  $BASE/man/man1 $BASE/man/man8 $BASE/data $BASE/data/mysql $BASE/data/test



 chmod o-rwx $BASE/data $BASE/data/*

fi
@@ -219,6 +219,7 @@ if [ $BASE_SYSTEM != "netware" ] ; then 
  fi

  if [ -d man ] ; then

    $CP man/*.1 $BASE/man/man1

    $CP man/*.8 $BASE/man/man8

  fi

fi
@@ -309,7 +310,6 @@ else 
fi



# Make safe_mysqld a symlink to mysqld_safe for backwards portability

# To be removed in MySQL 4.1

if [ $BASE_SYSTEM != "netware" ] ; then

  (cd $BASE/bin ; ln -s mysqld_safe safe_mysqld )

fi