Commit 859b0550 authored by unknown's avatar unknown
Browse files

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

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-kt
parents 3aa28a12 10888499

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -2339,12 +2339,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)



# Shall we build the bench code?

AC_ARG_WITH(bench,

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_;

man/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 
## Process this file with automake to create Makefile.in



man1_MANS =   @man1_files@

EXTRA_DIST =  $(man1_MANS)

man8_MANS =   @man8_files@

EXTRA_DIST =  $(man1_MANS) $(man8_MANS)



# Don't update the files from bitkeeper

%::SCCS/s.%

mysql-test/r/func_time.result

+7 −0
Original line number Diff line number Diff line
@@ -758,6 +758,13 @@ select monthname(str_to_date(null, '%m')), monthname(str_to_date(null, '%m')), 
monthname(str_to_date(1, '%m')), monthname(str_to_date(0, '%m'));

monthname(str_to_date(null, '%m'))	monthname(str_to_date(null, '%m'))	monthname(str_to_date(1, '%m'))	monthname(str_to_date(0, '%m'))

NULL	NULL	January	NULL

set time_zone='-6:00';

create table t1(a timestamp);

insert into t1 values (19691231190001);

select * from t1;

a

1969-12-31 19:00:01

drop table t1;

create table t1(f1 date, f2 time, f3 datetime);

insert into t1 values ("2006-01-01", "12:01:01", "2006-01-01 12:01:01");

insert into t1 values ("2006-01-02", "12:01:02", "2006-01-02 12:01:02");