Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


client/client_priv.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/rpl_deadlock_innodb.result:
  Auto merged
mysql-test/r/rpl_flushlog_loop.result:
  Auto merged
mysql-test/r/rpl_known_bugs_detection.result:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
mysql-test/r/rpl_ndb_extraCol.result:
  Auto merged
mysql-test/r/rpl_ndb_sync.result:
  Auto merged
mysql-test/r/rpl_rbr_to_sbr.result:
  Auto merged
mysql-test/r/rpl_row_inexist_tbl.result:
  Auto merged
mysql-test/r/rpl_row_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Auto merged
mysql-test/r/rpl_row_tabledefs_3innodb.result:
  Auto merged
mysql-test/r/rpl_stm_max_relay_size.result:
  Auto merged
mysql-test/r/rpl_stm_until.result:
  Auto merged
mysql-test/r/sp-code.result:
  Auto merged
mysql-test/r/type_datetime.result:
  Auto merged
mysql-test/t/mysqlbinlog.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/lex.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/gis.result:
  Merge 5.0->5.1
mysql-test/r/rpl_000015.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_change_master.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_loaddata.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_log_pos.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_ndb_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_rotate_logs.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_log_innodb.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_reset_slave.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_row_until.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id1.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_server_id2.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_log.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/r/rpl_stm_reset_slave.result:
  Merge after adding new column to SHOW SLAVE STATUS
mysql-test/t/gis.test:
  Merge 5.0->5.1

1 files changed, 33 insertions, 3 deletions

diff --git a/extra/yassl/taocrypt/include/hash.hpp b/extra/yassl/taocrypt/include/hash.hpp
index 71072bd3e74..fa5f6c04720 100644
--- a/extra/yassl/taocrypt/include/hash.hpp
+++ b/extra/yassl/taocrypt/include/hash.hpp
@@ -31,7 +31,6 @@ namespace TaoCrypt {
 // HASH
 class HASH : public virtual_base {
 public:
-    HASH() {}
     virtual ~HASH() {}
 
     virtual void Update(const byte*, word32) = 0;
@@ -58,8 +57,7 @@ public:
     word32  GetBitCountLo() const { return  loLen_ << 3; }
     word32  GetBitCountHi() const { return (loLen_ >> (8*sizeof(loLen_) - 3)) +
                                            (hiLen_ << 3); } 
-
-    enum { MaxDigestSz = 5, MaxBufferSz = 64 };
+    enum { MaxDigestSz = 8, MaxBufferSz = 64 };
 protected:
     typedef word32 HashLengthType;
     word32          buffLen_;   // in bytes
@@ -74,6 +72,38 @@ protected:
 };
 
 
+#ifdef WORD64_AVAILABLE
+
+// 64-bit HASH with Transform
+class HASH64withTransform : public HASH {
+public:
+    HASH64withTransform(word32 digSz, word32 buffSz);
+    virtual ~HASH64withTransform() {}
+    virtual ByteOrder getByteOrder()  const = 0;
+    virtual word32    getPadSize()    const = 0;
+
+    virtual void Update(const byte*, word32);
+    virtual void Final(byte*);
+
+    word32  GetBitCountLo() const { return  loLen_ << 3; }
+    word32  GetBitCountHi() const { return (loLen_ >> (8*sizeof(loLen_) - 3)) +
+                                           (hiLen_ << 3); } 
+    enum { MaxDigestSz = 8, MaxBufferSz = 128 };
+protected:
+    typedef word32 HashLengthType;
+    word32          buffLen_;   // in bytes
+    HashLengthType  loLen_;     // length in bytes
+    HashLengthType  hiLen_;     // length in bytes
+    word64          digest_[MaxDigestSz];
+    word64          buffer_[MaxBufferSz / sizeof(word64)];
+
+    virtual void Transform() = 0;
+
+    void AddLength(word32);
+};
+
+#endif // WORD64_AVAILABLE
+
 
 } // namespace