bk commit into 5.1 tree (joerg:1.1954)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1954 05/11/03 12:01:27 joerg@stripped +2 -0
  Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
  Moved from "storage/ndb/include/kernel/trigger_definitions.h" to "storage/ndb/include/ndb_global.h.in".

  storage/ndb/include/ndb_global.h.in
    1.13 05/11/03 12:01:22 joerg@stripped +8 -0
    Define "MIN" and "MAX" globally for all NDB, in case the platform does not have it (like Solaris).
    Moved here from "include/kernel/trigger_definitions.h".

  storage/ndb/include/kernel/trigger_definitions.h
    1.7 05/11/03 12:01:22 joerg@stripped +0 -8
    "MIN" and "MAX" are not used for trigger stuff, move to a more global include.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M51/clone-5.1

--- 1.12/storage/ndb/include/ndb_global.h.in	2005-10-22 00:59:23 +02:00
+++ 1.13/storage/ndb/include/ndb_global.h.in	2005-11-03 12:01:22 +01:00
@@ -137,4 +137,12 @@
 
 #endif /* SCO */
 
+#ifndef MIN
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
+#ifndef MAX
+#define MAX(x,y) (((x)>(y))?(x):(y))
+#endif
+
 #endif

--- 1.6/storage/ndb/include/kernel/trigger_definitions.h	2005-10-13 10:52:14 +02:00
+++ 1.7/storage/ndb/include/kernel/trigger_definitions.h	2005-11-03 12:01:22 +01:00
@@ -21,14 +21,6 @@
 #include "ndb_limits.h"
 #include <signaldata/DictTabInfo.hpp>
 
-#ifndef MIN
-#define MIN(x,y) (((x)<(y))?(x):(y))
-#endif
-
-#ifndef MAX
-#define MAX(x,y) (((x)>(y))?(x):(y))
-#endif
-
 #define ILLEGAL_TRIGGER_ID ((Uint32)(~0))
 
 struct TriggerType {