Commit 9c9a27d9 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.0 

into  maint2.mysql.com:/data/localhome/tsmith/bk/50
parents 2c4a003e 5bd9bf55

client/mysql.cc

+7 −2
Original line number Diff line number Diff line
@@ -2354,7 +2354,12 @@ print_table_data(MYSQL_RES *result) 
    (void) tee_fputs("|", PAGER);

    for (uint off=0; (field = mysql_fetch_field(result)) ; off++)

    {

      tee_fprintf(PAGER, " %-*s |",(int) min(field->max_length,

      uint name_length= (uint) strlen(field->name);

      uint numcells= charset_info->cset->numcells(charset_info,

                                                  field->name,

                                                  field->name + name_length);

      uint display_length= field->max_length + name_length - numcells;

      tee_fprintf(PAGER, " %-*s |",(int) min(display_length,

                                            MAX_COLUMN_LENGTH),

                  field->name);

      num_flag[off]= IS_NUM(field->type);

client/mysqldump.c

+8 −4
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static int get_options(int *argc, char ***argv) 
static void DB_error(MYSQL *mysql, const char *when)

{

  DBUG_ENTER("DB_error");

  my_printf_error(0,"Got error: %d: %s %s", MYF(0),

  fprintf(stderr, "%s: Got error: %d: %s %s\n", my_progname,

          mysql_errno(mysql), mysql_error(mysql), when);

  safe_exit(EX_MYSQLERR);

  DBUG_VOID_RETURN;
@@ -879,8 +879,9 @@ static int mysql_query_with_error_report(MYSQL *mysql_con, MYSQL_RES **res, 
  if (mysql_query(mysql_con, query) ||

      (res && !((*res)= mysql_store_result(mysql_con))))

  {

    my_printf_error(0, "Couldn't execute '%s': %s (%d)", MYF(0),

                    query, mysql_error(mysql_con), mysql_errno(mysql_con));

    fprintf(stderr, "%s: Couldn't execute '%s': %s (%d)\n",

            my_progname, query,

            mysql_error(mysql_con), mysql_errno(mysql_con));

    safe_exit(EX_MYSQLERR);

    return 1;

  }
@@ -2234,7 +2235,10 @@ static void dump_table(char *table, char *db) 
      check_io(md_result_file);

    }

    if (mysql_query_with_error_report(mysql, 0, query))

    {

      DB_error(mysql, "when retrieving data from server");

      goto err;

    }

    if (quick)

      res=mysql_use_result(mysql);

    else

extra/yassl/include/openssl/generate_prefix_files.pl

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ sub generate_prefix($$) 
      next;

    }



    if ( /^\s*[a-zA-Z0-9*_ ]+\s+([_a-zA-Z0-9]+)\s*\(/ )

    if ( /^\s*[a-zA-Z0-9*_ ]+\s+\*?([_a-zA-Z0-9]+)\s*\(/ )

    {

      print OUT "#define $1 ya$1\n";

    }

extra/yassl/include/openssl/prefix_ssl.h

+9 −1
Original line number Diff line number Diff line 
#define Copyright yaCopyright

#define yaSSL_CleanUp yayaSSL_CleanUp

#define BN_bin2bn yaBN_bin2bn

#define DH_new yaDH_new

#define DH_free yaDH_free

#define RSA_free yaRSA_free
@@ -92,6 +93,12 @@ 
#define SSL_want_read yaSSL_want_read

#define SSL_want_write yaSSL_want_write

#define SSL_pending yaSSL_pending

#define SSLv3_method yaSSLv3_method

#define SSLv3_server_method yaSSLv3_server_method

#define SSLv3_client_method yaSSLv3_client_method

#define TLSv1_server_method yaTLSv1_server_method

#define TLSv1_client_method yaTLSv1_client_method

#define SSLv23_server_method yaSSLv23_server_method

#define SSL_CTX_use_certificate_file yaSSL_CTX_use_certificate_file

#define SSL_CTX_use_PrivateKey_file yaSSL_CTX_use_PrivateKey_file

#define SSL_CTX_set_cipher_list yaSSL_CTX_set_cipher_list
@@ -115,11 +122,13 @@ 
#define RAND_write_file yaRAND_write_file

#define RAND_load_file yaRAND_load_file

#define RAND_status yaRAND_status

#define RAND_bytes yaRAND_bytes

#define DES_set_key yaDES_set_key

#define DES_set_odd_parity yaDES_set_odd_parity

#define DES_ecb_encrypt yaDES_ecb_encrypt

#define SSL_CTX_set_default_passwd_cb_userdata yaSSL_CTX_set_default_passwd_cb_userdata

#define SSL_SESSION_free yaSSL_SESSION_free

#define SSL_peek yaSSL_peek

#define SSL_get_certificate yaSSL_get_certificate

#define SSL_get_privatekey yaSSL_get_privatekey

#define X509_get_pubkey yaX509_get_pubkey
@@ -150,4 +159,3 @@ 
#define MD5_Init yaMD5_Init

#define MD5_Update yaMD5_Update

#define MD5_Final yaMD5_Final
 
#define SSL_peek yaSSL_peek

extra/yassl/taocrypt/src/misc.cpp

+2 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "runtime.hpp"

#include "misc.hpp"





#if !defined(YASSL_MYSQL_COMPATIBLE)

extern "C" {



    // for libcurl configure test, these are the signatures they use
@@ -37,6 +37,7 @@ extern "C" { 
    char CRYPTO_lock() { return 0;}

    char CRYPTO_add_lock() { return 0;}

}  // extern "C"

#endif



#ifdef YASSL_PURE_C