Commit a49c12f5 authored by unknown's avatar unknown
Browse files

manually merged 


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/r/binary.result:
  Auto merged
mysql-test/r/truncate.result:
  Auto merged
mysql-test/t/binary.test:
  Auto merged
mysql-test/t/truncate.test:
  Auto merged
mysys/my_lib.c:
  Auto merged
strings/my_vsnprintf.c:
  Auto merged
support-files/Makefile.am:
  Auto merged
parents 62a63815 9d1a9d72

Build-tools/mysql-copyright

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ sub trim_the_fat 
                open(CONFIGURE,">configure.in") or die "Unable to open configure.in for write: $!\n";

                print CONFIGURE $configure;

                close(CONFIGURE);

                `autoconf`;

                `aclocal && autoheader && aclocal && automake && autoconf`;

                die "'./configure' was not produced!" unless (-f "configure");

                chdir("$cwd");

        }

mysql-test/mysql-test-run.sh

+4 −2
Original line number Diff line number Diff line
@@ -367,10 +367,12 @@ while test $# -gt 0; do 
      VALGRIND=`which valgrind` # this will print an error if not found

      # Give good warning to the user and stop

      if [ -z "$VALGRIND" ] ; then

        $ECHO "You need to have the 'valgrind' program in your PATH to run mysql-test-run with option --valgrind. Valgrind's home page is http://developer.kde.org/~sewardj ."

        $ECHO "You need to have the 'valgrind' program in your PATH to run mysql-test-run with option --valgrind. Valgrind's home page is http://valgrind.kde.org ."

        exit 1

      fi

      VALGRIND="$VALGRIND --tool=memcheck --alignment=8 --leak-check=yes --num-callers=16"

      # >=2.1.2 requires the --tool option, some versions write to stdout, some to stderr

      valgrind --help 2>&1 | grep "\-\-tool" > /dev/null && VALGRIND="$VALGRIND --tool=memcheck"

      VALGRIND="$VALGRIND --alignment=8 --leak-check=yes --num-callers=16"

      EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb"

      EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb"

      SLEEP_TIME_AFTER_RESTART=10

mysql-test/r/func_set.result

+9 −0
Original line number Diff line number Diff line
@@ -56,3 +56,12 @@ id elt(two.val,'one','two') 
2	one

4	two

drop table t1,t2;

select find_in_set(binary 'a',binary 'A,B,C');

find_in_set(binary 'a',binary 'A,B,C')

0

select find_in_set('a',binary 'A,B,C');

find_in_set('a',binary 'A,B,C')

0

select find_in_set(binary 'a', 'A,B,C');

find_in_set(binary 'a', 'A,B,C')

0

mysql-test/r/truncate.result

+21 −0
Original line number Diff line number Diff line
@@ -31,4 +31,25 @@ SELECT * from t1; 
a

1

2

delete from t1;

insert into t1 (a) values (NULL),(NULL);

SELECT * from t1;

a

3

4

drop table t1;

create temporary table t1 (a integer auto_increment primary key);

insert into t1 (a) values (NULL),(NULL);

truncate table t1;

insert into t1 (a) values (NULL),(NULL);

SELECT * from t1;

a

1

2

delete from t1;

insert into t1 (a) values (NULL),(NULL);

SELECT * from t1;

a

3

4

drop table t1;

mysql-test/r/variables.result

+16 −0
Original line number Diff line number Diff line
@@ -436,3 +436,19 @@ SELECT @@global.session.key_buffer_size; 
ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1

SELECT @@global.local.key_buffer_size;

ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'key_buffer_size' at line 1

set @tstlw = @@log_warnings;

show global variables like 'log_warnings';

Variable_name	Value

log_warnings	1

set global log_warnings = 0;

show global variables like 'log_warnings';

Variable_name	Value

log_warnings	0

set global log_warnings = 42;

show global variables like 'log_warnings';

Variable_name	Value

log_warnings	42

set global log_warnings = @tstlw;

show global variables like 'log_warnings';

Variable_name	Value

log_warnings	1