Commit d2d490a4 authored by unknown's avatar unknown
Browse files

Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  may.pils.ru:/home/svoj/devel/mysql/BUG19192/mysql-5.0
parents eeb8d4c8 57e7bc55

.bzrignore

+12 −9
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ bkpush.log 
bkpush.log*

build.log

build_tags.sh

client/#mysql.cc#

client/*.ds?

client/*.vcproj

client/completion_hash.cpp
@@ -290,6 +291,7 @@ client/my_decimal.h 
client/my_user.c

client/mysql

client/mysql.cpp

client/mysql_upgrade

client/mysqladmin

client/mysqladmin.c

client/mysqladmin.cpp
@@ -365,6 +367,9 @@ extra/resolve_stack_dump 
extra/resolveip

extra/sql_state.h

extra/tztime.cc

extra/yassl/taocrypt/benchmark/benchmark

extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

fcns.c

fcns.h

gdbinit
@@ -382,6 +387,7 @@ include/my_global.h 
include/mysql_version.h

include/mysqld_ername.h

include/mysqld_error.h

include/openssl

include/readline

include/readline/*.h

include/readline/readline.h
@@ -672,6 +678,7 @@ mysql-test/r/bdb-alter-table-2.err 
mysql-test/r/bdb-crash.err

mysql-test/r/bdb-deadlock.err

mysql-test/r/bdb.err

mysql-test/r/bdb.log

mysql-test/r/bdb_cache.err

mysql-test/r/client_test.err

mysql-test/r/csv.err
@@ -679,6 +686,7 @@ mysql-test/r/ctype_ucs.err 
mysql-test/r/derived.err

mysql-test/r/exampledb.err

mysql-test/r/func_encrypt.err

mysql-test/r/im_client_port.log

mysql-test/r/index_merge_load.result

mysql-test/r/isam.err

mysql-test/r/lowercase_table2.err
@@ -727,6 +735,7 @@ mysql-test/r/rpl000016.eval 
mysql-test/r/rpl_log.eval

mysql-test/r/slave-running.eval

mysql-test/r/slave-stopped.eval

mysql-test/r/udf.log

mysql-test/share/mysql

mysql-test/std_data/*.pem

mysql-test/t/index_merge.load
@@ -1051,6 +1060,7 @@ scripts/mysql_install_db 
scripts/mysql_secure_installation

scripts/mysql_setpermission

scripts/mysql_tableinfo

scripts/mysql_upgrade

scripts/mysql_zap

scripts/mysqlaccess

scripts/mysqlbug
@@ -1142,7 +1152,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
@@ -1273,12 +1285,3 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj
 
scripts/mysql_upgrade

include/openssl

mysql-test/r/bdb.log

mysql-test/r/im_client_port.log

mysql-test/r/udf.log

extra/yassl/taocrypt/benchmark/benchmark

extra/yassl/taocrypt/test/test

extra/yassl/testsuite/testsuite

client/mysql_upgrade

client/mysql.cc

+1 −0
Original line number Diff line number Diff line
@@ -823,6 +823,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