Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0

extra/yassl/include/yassl_int.hpp

@@ -122,7 +122,8 @@ public:
 
     friend sslFactory& GetSSL_Factory();        // singleton creator
 private:
-    static sslFactory instance;
+    static sslFactory instance_;
+
     sslFactory(const sslFactory&);              // hide copy
     sslFactory& operator=(const sslFactory&);   // and assign   
 };
@@ -207,9 +208,10 @@ public:
 
     friend Sessions& GetSessions(); // singleton creator
 private:
+    static Sessions instance_;
+
     Sessions(const Sessions&);              // hide copy
     Sessions& operator=(const Sessions&);   // and assign
-    static Sessions instance;
 };
 
 

extra/yassl/src/log.cpp

@@ -26,9 +26,9 @@
 #include "log.hpp"
 
 #ifdef YASSL_LOG
-    #include <ctime>
-    #include <cstdio>
-    #include <cstring>
+    #include <time.h>
+    #include <stdio.h>
+    #include <string.h>
 #endif
 
 

extra/yassl/src/yassl_int.cpp

@@ -1324,18 +1324,19 @@ SSL_SESSION::~SSL_SESSION()
 }
 
 
-Sessions Sessions::instance; // simple singleton
+Sessions Sessions::instance_; // simple singleton
 
 Sessions& GetSessions()
 {
-    return Sessions::instance;
+    return Sessions::instance_;
 }
 
-sslFactory sslFactory::instance;
+
+sslFactory sslFactory::instance_; // simple singleton
 
 sslFactory& GetSSL_Factory()
 {   
-    return sslFactory::instance;
+    return sslFactory::instance_;
 }
 
 

extra/yassl/taocrypt/include/integer.hpp

@@ -251,11 +251,11 @@ public:
 private:
     friend class ModularArithmetic;
     friend class MontgomeryRepresentation;
-    Integer(word value, unsigned int length);
 
     static const Integer zero;
     static const Integer one;
     static const Integer two;
+    Integer(word value, unsigned int length);
     int PositiveCompare(const Integer& t) const;
 
     friend void PositiveAdd(Integer& sum, const Integer& a, const Integer& b);

extra/yassl/taocrypt/src/integer.cpp

@@ -3948,6 +3948,9 @@ Integer CRT(const Integer &xp, const Integer &p, const Integer &xq,
 
 #ifdef __GNUC__
 template unsigned int DivideThreeWordsByTwo<unsigned int, DWord>(unsigned int*, unsigned int, unsigned int, DWord*);
+#if defined(SSE2_INTRINSICS_AVAILABLE)
+template AlignedAllocator<unsigned int>::pointer StdReallocate<unsigned int, AlignedAllocator<unsigned int> >(AlignedAllocator<unsigned int>&, unsigned int*, AlignedAllocator<unsigned int>::size_type, AlignedAllocator<unsigned int>::size_type, bool);
+#endif
 #endif
 
 } // namespace

innobase/srv/srv0start.c

@@ -1736,7 +1736,7 @@ innobase_shutdown_for_mysql(void)
 "  InnoDB: MySQL has requested a very fast shutdown without flushing "
 "the InnoDB buffer pool to data files. At the next mysqld startup "
 "InnoDB will do a crash recovery!\n");
-	  	}
+	}
 
 #ifdef __NETWARE__
 	if(!panic_shutdown)
@@ -1758,8 +1758,9 @@ innobase_shutdown_for_mysql(void)
         to die; all which counts is that we flushed the log; a 'very fast'
         shutdown is essentially a crash. */
 
-        if (srv_fast_shutdown)
-          return((int) DB_SUCCESS);
+	if (srv_fast_shutdown == 2) {
+		return(DB_SUCCESS);
+	}
 
 	/* All threads end up waiting for certain events. Put those events
 	to the signaled state. Then the threads will exit themselves in