Commit 5c484fd0 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb 

into  perch.ndb.mysql.com:/home/jonas/src/51-work
parents a370b2f6 2c2bf276

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2316,12 +2316,16 @@ then 
  man_dirs="man"

  man1_files=`ls -1 $srcdir/man/*.1 | sed -e 's;^.*man/;;'`

  man1_files=`echo $man1_files`

  man8_files=`ls -1 $srcdir/man/*.8 | sed -e 's;^.*man/;;'`

  man8_files=`echo $man8_files`

else

  man_dirs=""

  man1_files=""

  man8_files=""

fi

AC_SUBST(man_dirs)

AC_SUBST(man1_files)

AC_SUBST(man8_files)



# Don't build readline, i have it already

AC_ARG_WITH(readline,

extra/yassl/taocrypt/include/asn.hpp

+4 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ enum Constants 
    MAX_ALGO_SIZE =  9,

    MAX_DIGEST_SZ = 25,    // SHA + enum(Bit or Octet) + length(4)

    DSA_SIG_SZ    = 40,

    NAME_MAX      = 512    // max total of all included names

    ASN_NAME_MAX  = 512    // max total of all included names

};
@@ -216,7 +216,7 @@ enum { SHA_SIZE = 20 }; 
// A Signing Authority

class Signer {

    PublicKey key_;

    char      name_[NAME_MAX];

    char      name_[ASN_NAME_MAX];

    byte      hash_[SHA_SIZE];

public:

    Signer(const byte* k, word32 kSz, const char* n, const byte* h);
@@ -270,8 +270,8 @@ private: 
    byte      subjectHash_[SHA_SIZE];   // hash of all Names

    byte      issuerHash_[SHA_SIZE];    // hash of all Names

    byte*     signature_;

    char      issuer_[NAME_MAX];        // Names

    char      subject_[NAME_MAX];       // Names

    char      issuer_[ASN_NAME_MAX];    // Names

    char      subject_[ASN_NAME_MAX];   // Names

    char      beforeDate_[MAX_DATE_SZ]; // valid before date

    char      afterDate_[MAX_DATE_SZ];  // valid after date

    bool      verify_;                  // Default to yes, but could be off

extra/yassl/taocrypt/src/asn.cpp

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ void CertDecoder::GetName(NameType nt) 


    SHA    sha;

    word32 length = GetSequence();  // length of all distinguished names

    assert (length < NAME_MAX);

    assert (length < ASN_NAME_MAX);

    length += source_.get_index();



    char*  ptr = (nt == ISSUER) ? issuer_ : subject_;

include/my_base.h

+2 −1
Original line number Diff line number Diff line
@@ -370,8 +370,9 @@ enum ha_base_keytype { 
                                            would lead to a duplicate key

                                            error in some other table. */

#define HA_ERR_TABLE_NEEDS_UPGRADE 164  /* The table changed in storage engine */

#define HA_ERR_TABLE_READONLY    165  /* The table is not writable */



#define HA_ERR_LAST              164  /*Copy last error nr.*/

#define HA_ERR_LAST              165  /*Copy last error nr.*/

/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)

libmysqld/lib_sql.cc

+6 −2
Original line number Diff line number Diff line
@@ -894,10 +894,14 @@ bool Protocol::send_fields(List<Item> *list, uint flags) 
    }

    else

    {

      uint max_char_len;

      /* With conversion */

      client_field->charsetnr= thd_cs->number;

      uint char_len= server_field.length / item->collation.collation->mbmaxlen;

      client_field->length= char_len * thd_cs->mbmaxlen;

      max_char_len= (server_field.type >= (int) MYSQL_TYPE_TINY_BLOB &&

                     server_field.type <= (int) MYSQL_TYPE_BLOB) ?

                     server_field.length / item->collation.collation->mbminlen :

                     server_field.length / item->collation.collation->mbmaxlen;

      client_field->length= max_char_len * thd_cs->mbmaxlen;

    }

    client_field->type=   server_field.type;

    client_field->flags= server_field.flags;