Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1-ndb

include/my_time.h

@@ -28,6 +28,15 @@ C_MODE_START
 
 extern ulonglong log_10_int[20];
 
+/*
+  Portable time_t replacement.
+  Should be signed and hold seconds for 1902-2038 range.
+*/
+typedef long my_time_t;
+
+#define MY_TIME_T_MAX LONG_MAX
+#define MY_TIME_T_MIN LONG_MIN
+
 #define YY_PART_YEAR	   70
 
 /* Flags to str_to_datetime */

include/mysql_time.h

@@ -17,7 +17,14 @@
 #ifndef _mysql_time_h_
 #define _mysql_time_h_
 
-/* Time declarations shared between server and client library */
+/*
+  Time declarations shared between the server and client API:
+  you should not add anything to this header unless it's used
+  (and hence should be visible) in mysql.h.
+  If you're looking for a place to add new time-related declaration,
+  it's most likely my_time.h. See also "C API Handling of Date
+  and Time Values" chapter in documentation.
+*/
 
 enum enum_mysql_timestamp_type
 {
@@ -34,13 +41,4 @@ typedef struct st_mysql_time
   enum enum_mysql_timestamp_type time_type;
 } MYSQL_TIME;
 
-
-/* 
-  Portable time_t replacement. 
-  Should be signed and hold seconds for 1902-2038 range.
-*/
-typedef long my_time_t;
-#define MY_TIME_T_MAX LONG_MAX
-#define MY_TIME_T_MIN LONG_MIN
-
 #endif /* _mysql_time_h_ */

ndb/src/kernel/vm/ArrayPool.hpp

@@ -148,26 +148,6 @@ public:
   void releaseList(Uint32 n, Uint32 first, Uint32 last);
   //private:
 
-  /**
-   * Print
-   * (Run operator NdbOut<< on every element)
-   */
-  void print(NdbOut & out){
-#ifdef VM_TRACE
-    out << "FirstFree = " << firstFree << endl;
-    for(Uint32 i = 0; i<size; i++){
-#ifdef ARRAY_GUARD
-      if(BitmaskImpl::get(bitmaskSz, theAllocatedBitmask, i))
-	out << "A ";
-      else
-	out << "F ";
-#endif
-      out << i << ": " << theArray[i] << " ";
-    }
-    out << endl;
-#endif
-  }
-
 #ifdef DEBUG
   Uint32 getNoOfFree2() const {
     Uint32 c2 = size;

sql/tztime.cc

@@ -32,6 +32,7 @@
 #include "mysql_priv.h"
 #else
 #include <my_global.h>
+#include <my_time.h>
 #include "tztime.h"
 #include <my_sys.h>
 #endif

sql/tztime.h

@@ -19,8 +19,6 @@
 #pragma interface			/* gcc class interface */
 #endif
 
-#include <mysql_time.h>
-
 #if !defined(TESTTIME) && !defined(TZINFO2SQL)
 
 /*