Commit 69e1ccc8 authored by unknown's avatar unknown
Browse files

Merge zippy.(none):/home/cmiller/work/mysql/merge/tmp_merge 

into  zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1-new


config/ac-macros/zlib.m4:
  Auto merged
include/my_sys.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/t/rpl_temporary.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
storage/ndb/test/ndbapi/Makefile.am:
  Auto merged
storage/ndb/test/ndbapi/testInterpreter.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
  manual merge
parents 495e1080 5fb23aa3

config/ac-macros/openssl.m4

+6 −4
Original line number Diff line number Diff line
@@ -15,8 +15,9 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      for d in /usr/ssl/lib /usr/local/ssl/lib /usr/lib/openssl \

/usr/lib /usr/lib64 /opt/ssl/lib /opt/openssl/lib \

/usr/freeware/lib32 /usr/local/lib/ ; do

      # Just to be safe, we test for ".so" anyway

      if test -f $d/libssl.a || test -f $d/libssl.so || test -f $d/libssl$shrext ; then

      # Test for libssl using all known library file endings

      if test -f $d/libssl.a || test -f $d/libssl.so || \

         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then

        OPENSSL_LIB=$d

      fi

      done
@@ -28,8 +29,9 @@ AC_DEFUN([MYSQL_FIND_OPENSSL], [ 
      if test -f $incs/openssl/ssl.h  ; then

        OPENSSL_INCLUDE=-I$incs

      fi

      # Just to be safe, we test for ".so" anyway

      if test -f $libs/libssl.a || test -f $libs/libssl.so || test -f $libs/libssl$shrext ; then

      # Test for libssl using all known library file endings

      if test -f $d/libssl.a || test -f $d/libssl.so || \

         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then

        OPENSSL_LIB=$libs

      fi

      ;;

config/ac-macros/zlib.m4

+5 −4
Original line number Diff line number Diff line
@@ -89,10 +89,11 @@ case $SYSTEM_TYPE in 
        fi

        ;;

      *)

        # Just to be safe, we test for ".so" anyway

        eval shrexts=\"$shrext_cmds\"

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

                   -f "$mysql_zlib_dir/lib/libz$shrext" \) \

        # Test for libz using all known library file endings

        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-test/r/func_in.result

+17 −0
Original line number Diff line number Diff line
@@ -326,3 +326,20 @@ deallocate prepare s; 
set @str=NULL;

drop table t2;

drop table t1;

create table t1 (

some_id smallint(5) unsigned,

key (some_id)

);

insert into t1 values (1),(2);

select some_id from t1 where some_id not in(2,-1);

some_id

1

select some_id from t1 where some_id not in(-4,-1,-4);

some_id

1

2

select some_id from t1 where some_id not in(-4,-1,3423534,2342342);

some_id

1

2

drop table t1;

mysql-test/t/func_in.test

+12 −0
Original line number Diff line number Diff line
@@ -220,3 +220,15 @@ set @str=NULL; 
drop table t2;

drop table t1;



# BUG#19618: Crash in range optimizer for 

#   "unsigned_keypart NOT IN(negative_number,...)" 

#   (introduced in fix BUG#15872) 

create table t1 (

  some_id smallint(5) unsigned,

  key (some_id)

);

insert into t1 values (1),(2);

select some_id from t1 where some_id not in(2,-1);

select some_id from t1 where some_id not in(-4,-1,-4);

select some_id from t1 where some_id not in(-4,-1,3423534,2342342);

drop table t1;

mysql-test/t/rpl_temporary.test

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ drop table t1; 
#

#14157: utf8 encoding in binlog without set character_set_client

#

--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=koi8r test -e 'create table t1 (a int); set names koi8r; create temporary table `ÑÝÉË` (a int); insert into `ÑÝÉË` values (1); insert into t1 select * from `ÑÝÉË`'

--exec $MYSQL --character-sets-dir=../sql/share/charsets/ --default-character-set=latin1 test -e 'create table t1 (a int); set names latin1; create temporary table `äöüÄÖÜ` (a int); insert into `äöüÄÖÜ` values (1); insert into t1 select * from `äöüÄÖÜ`'



sync_slave_with_master;

#connection slave;