Commit 239b3859 authored by unknown's avatar unknown
Browse files

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

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel


client/mysqldump.c:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
mysys/my_malloc.c:
  Auto merged
mysys/my_static.c:
  Auto merged
mysys/safemalloc.c:
  Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql-common/my_time.c:
  Auto merged
mysql-test/r/sp.result:
  Merged from main 5.0
sql/sql_load.cc:
  Merged from main 5.0
parents c4879fe6 d2667d1a

client/mysqldump.c

+330 −235

File changed.

Preview size limit exceeded, changes collapsed.

client/mysqltest.c

+3 −5
Original line number Diff line number Diff line
@@ -3534,7 +3534,7 @@ void do_connect(struct st_command *command) 
		  opt_ssl_capath, opt_ssl_cipher);

#if MYSQL_VERSION_ID >= 50000

    /* Turn on ssl_verify_server_cert only if host is "localhost" */

    opt_ssl_verify_server_cert= !strcmp(ds_connection_name.str, "localhost");

    opt_ssl_verify_server_cert= !strcmp(ds_host.str, "localhost");

    mysql_options(&next_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                  &opt_ssl_verify_server_cert);

#endif
@@ -6002,15 +6002,13 @@ int main(int argc, char **argv) 


#ifdef HAVE_OPENSSL



#if MYSQL_VERSION_ID >= 50000

  opt_ssl_verify_server_cert= TRUE; /* Always on in mysqltest */

#endif



  if (opt_use_ssl)

  {

    mysql_ssl_set(&cur_con->mysql, opt_ssl_key, opt_ssl_cert, opt_ssl_ca,

		  opt_ssl_capath, opt_ssl_cipher);

#if MYSQL_VERSION_ID >= 50000

    /* Turn on ssl_verify_server_cert only if host is "localhost" */

    opt_ssl_verify_server_cert= opt_host && !strcmp(opt_host, "localhost");

    mysql_options(&cur_con->mysql, MYSQL_OPT_SSL_VERIFY_SERVER_CERT,

                  &opt_ssl_verify_server_cert);

#endif

extra/yassl/README

+8 −0
Original line number Diff line number Diff line 
*****************yaSSL Release notes, version 1.6.0 (2/22/07)



    This release of yaSSL contains bug fixes, portability enhancements, and

    better X509 support.



See normal  build instructions below under 1.0.6.

See libcurl build instructions below under 1.3.0 and note in 1.5.8.



*****************yaSSL Release notes, version 1.5.8 (1/10/07)



    This release of yaSSL contains bug fixes, portability enhancements, and

extra/yassl/include/buffer.hpp

+0 −3
Original line number Diff line number Diff line
@@ -49,13 +49,11 @@ const uint AUTO = 0xFEEDBEEF; 
// Checking Policy should implement a check function that tests whether the

// index is within the size limit of the array

struct Check {

    Check() {}

    void check(uint i, uint limit);

};





struct NoCheck {

    NoCheck() {}

    void check(uint, uint);

};
@@ -193,7 +191,6 @@ inline void checked_delete(T* p) 
// sets pointer to zero so safe for std conatiners

struct del_ptr_zero

{

    del_ptr_zero() {}

    template <typename T>

    void operator()(T*& p) const

    {

extra/yassl/include/crypto_wrapper.hpp

+0 −6
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ namespace yaSSL { 
// Digest policy should implement a get_digest, update, and get sizes for pad

// and  digest

struct Digest : public virtual_base {

    Digest() {}

    virtual void   get_digest(byte*) = 0;

    virtual void   get_digest(byte*, const byte*, unsigned int) = 0;

    virtual void   update(const byte*, unsigned int) = 0;
@@ -54,7 +53,6 @@ struct Digest : public virtual_base { 


// For use with NULL Digests

struct NO_MAC : public Digest {

    NO_MAC() {}

    void   get_digest(byte*);

    void   get_digest(byte*, const byte*, unsigned int);

    void   update(const byte*, unsigned int);
@@ -179,7 +177,6 @@ private: 
// BulkCipher policy should implement encrypt, decrypt, get block size, 

// and set keys for encrypt and decrypt

struct BulkCipher : public virtual_base {

    BulkCipher() {}

    virtual void   encrypt(byte*, const byte*, unsigned int) = 0;

    virtual void   decrypt(byte*, const byte*, unsigned int) = 0;

    virtual void   set_encryptKey(const byte*, const byte* = 0) = 0;
@@ -193,7 +190,6 @@ struct BulkCipher : public virtual_base { 


// For use with NULL Ciphers

struct NO_Cipher : public BulkCipher {

    NO_Cipher() {}

    void   encrypt(byte*, const byte*, unsigned int) {}

    void   decrypt(byte*, const byte*, unsigned int) {}

    void   set_encryptKey(const byte*, const byte*)  {}
@@ -315,14 +311,12 @@ struct Auth : public virtual_base { 
    virtual bool verify(const byte*, unsigned int, const byte*,

                        unsigned int) = 0;

    virtual uint get_signatureLength() const = 0;

    Auth() {}

    virtual ~Auth() {}

};





// For use with NULL Authentication schemes

struct NO_Auth : public Auth {

    NO_Auth() {}

    void   sign(byte*, const byte*, unsigned int, const RandomPool&) {}

    bool   verify(const byte*, unsigned int, const byte*, unsigned int) 

                    { return true; }