Commit af17f788 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-kt


mysql-test/r/partition_range.result:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 07703f17 ed849efc

.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

VC++Files/client/mysql.dsp

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

VC++Files/client/mysql_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -130,6 +130,10 @@ SOURCE=.\readline.cpp 
# End Source File

# Begin Source File



SOURCE=..\mysys\my_conio.c

# End Source File

# Begin Source File



SOURCE=.\sql_string.cpp

# End Source File

# End Target

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