Commit 4b639b6c 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


BitKeeper/etc/ignore:
  auto-union
client/mysql.cc:
  Auto merged
include/config-win.h:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/table.cc:
  Null-merged, as this doesn't apply after 5.1.4 .  -cm
parents dd02c9d2 6a46bf82

.bzrignore

+3 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ bkpush.log 
bkpush.log*

build.log

build_tags.sh

client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/completion_hash.cpp
@@ -1181,7 +1182,9 @@ sql/pack.c 
sql/safe_to_cache_query.txt

sql/share/*.sys

sql/share/charsets/gmon.out

sql/share/fixerrmsg.pl

sql/share/gmon.out

sql/share/iso639-2.txt

sql/share/mysql

sql/share/norwegian-ny/errmsg.sys

sql/share/norwegian/errmsg.sys

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -852,6 +852,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), 
  case OPT_NOPAGER:

    printf("WARNING: option deprecated; use --disable-pager instead.\n");

    opt_nopager= 1;

    break;

  case OPT_MYSQL_PROTOCOL:

  {

    if ((opt_protocol= find_type(argument, &sql_protocol_typelib,0)) <= 0)

extra/yassl/README

+13 −3
Original line number Diff line number Diff line 
yaSSL Release notes, version 1.3.0 (04/26/06)

yaSSL Release notes, version 1.3.5 (06/01/06)





    This release of yaSSL contains bug fixes, portability enhancements,

    better libcurl support, and improved non-blocking I/O.



See normal  build instructions below under 1.0.6.

See libcurl build instructions below under 1.3.0.





********************yaSSL Release notes, version 1.3.0 (04/26/06)





    This release of yaSSL contains minor bug fixes, portability enhancements,
@@ -17,8 +27,8 @@ See normal build instructions below under 1.0.6. 
    make

    make openssl-links



    (then go to your libcurl home and tell libcurl about yaSSL)

    ./configure --with-ssl=/yaSSL-HomeDir

    (then go to your libcurl home and tell libcurl about yaSSL build dir)

    ./configure --with-ssl=/yaSSL-BuildDir LDFLAGS=-lm

    make

extra/yassl/include/openssl/engine.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* engine.h for libcurl */



#undef HAVE_OPENSSL_ENGINE_H

extra/yassl/include/openssl/pkcs12.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
/* pkcs12.h for libcurl */





#undef HAVE_OPENSSL_PKCS12_H