Commit 22b92457 authored by unknown's avatar unknown
Browse files

Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge 

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge


BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822:
  Auto merged
configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
mysql-test/t/udf.test:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
BitKeeper/deleted/.del-mysqld.vcproj~6aa7b3f9c3e28fcb:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/r/sp.result:
  Manual merge.  Place 5.0 test before 5.1 test.
mysql-test/t/sp.test:
  Manual merge.  Place 5.0 test before 5.1 test.
mysys/my_bitmap.c:
  Manual merge.
scripts/make_binary_distribution.sh:
  Manual merge.
sql/Makefile.am:
  Manual merge.
sql/slave.cc:
  Manual merge.
sql/sql_class.h:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
sql/sql_select.cc:
  Manual merge.
tests/mysql_client_test.c:
  Manual merge.
parents b6897efb 10888499

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

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/derived.result

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ select * from t1; 
N	M

3	0

delete P1.*,p2.* from `t1` AS P1 INNER JOIN (SELECT N FROM `t1` GROUP BY N HAVING Count(M) > 1) AS p2 ON P1.N = p2.N;

ERROR HY000: The target table p2 of the DELETE is not updatable

ERROR 42S02: Unknown table 'p2' in MULTI DELETE

delete P1.* from `t1` AS P1 INNER JOIN (SELECT aaa FROM `t1` GROUP BY N HAVING Count(M) > 1) AS P2 ON P1.N = P2.N;

ERROR 42S22: Unknown column 'aaa' in 'field list'

drop table t1;