bzr push into mysql-5.1-telco-7.1 branch (martin.zaun:3901 to 3902)

[Martin Zaun]

 3902 Martin Zaun	2010-10-19 [merge]
      merge from ndb-7.1-ndbtypes

    modified:
      storage/ndb/include/ndb_types.h.in
 3901 Martin Zaun	2010-10-19 [merge]
      crund - merge

    removed:
      storage/ndb/test/crund/martins_little_helpers/src/utils/Properties.cpp
      storage/ndb/test/crund/src/com/mysql/cluster/crund/JdoLoad.java
      storage/ndb/test/crund/tws_benchmark/run.properties.sample
      storage/ndb/test/crund/tws_benchmark/schema.sql
      storage/ndb/test/crund/tws_benchmark/src/Main.java
    added:
      storage/ndb/test/crund/src/com/mysql/cluster/crund/CrundDriver.java
      storage/ndb/test/crund/src/crundndb/CrundDriver.cpp
      storage/ndb/test/crund/src/crundndb/CrundDriver.hpp
      storage/ndb/test/crund/src/crundndb/Driver.hpp
      storage/ndb/test/crund/src/crundndb/NdbApiDriver.cpp
      storage/ndb/test/crund/src/crundndb/NdbApiDriver.hpp
      storage/ndb/test/crund/tws/
      storage/ndb/test/crund/tws/README.txt
      storage/ndb/test/crund/tws/run.properties.sample
      storage/ndb/test/crund/tws/schema.sql
      storage/ndb/test/crund/tws/tws_cpp/
      storage/ndb/test/crund/tws/tws_cpp/Driver.cpp
      storage/ndb/test/crund/tws/tws_cpp/Driver.hpp
      storage/ndb/test/crund/tws/tws_cpp/NdbApiTwsDriver.cpp
      storage/ndb/test/crund/tws/tws_cpp/NdbApiTwsDriver.hpp
      storage/ndb/test/crund/tws/tws_cpp/README.txt
      storage/ndb/test/crund/tws/tws_cpp/TwsDriver.cpp
      storage/ndb/test/crund/tws/tws_cpp/TwsDriver.hpp
      storage/ndb/test/crund/tws/tws_java/nbproject/private_sample/configs/
      storage/ndb/test/crund/tws/tws_java/nbproject/private_sample/configs/server-dbg.properties
      storage/ndb/test/crund/tws/tws_java/nbproject/private_sample/configs/server-opt.properties
      storage/ndb/test/crund/tws/tws_java/src/com/
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/ClusterjLoad.java
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/Driver.java
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/JdbcLoad.java
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/NdbjtieLoad.java
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/TwsDriver.java
      storage/ndb/test/crund/tws/tws_java/src/com/mysql/cluster/benchmark/tws/TwsLoad.java
    renamed:
      storage/ndb/test/crund/src/crundndb/Operations.cpp => storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp
      storage/ndb/test/crund/src/crundndb/Operations.hpp => storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.hpp
      storage/ndb/test/crund/tws_benchmark/ => storage/ndb/test/crund/tws/tws_java/
    modified:
      .bzrignore
      storage/ndb/test/crund/Makefile
      storage/ndb/test/crund/Makefile.defaults
      storage/ndb/test/crund/build.xml
      storage/ndb/test/crund/config_samples/env.properties
      storage/ndb/test/crund/martins_little_helpers/src/utils/Makefile
      storage/ndb/test/crund/martins_little_helpers/src/utils/Properties.hpp
      storage/ndb/test/crund/martins_little_helpers/src/utils/string_helpers.hpp
      storage/ndb/test/crund/scripts/load_shema.sh
      storage/ndb/test/crund/src/com/mysql/cluster/crund/A.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/ClusterjLoad.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/Driver.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/JdbcLoad.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/JpaLoad.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbApiLoad.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbBase.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbJTieLoad.java
      storage/ndb/test/crund/src/com/mysql/cluster/crund/NdbjLoad.java
      storage/ndb/test/crund/src/crundndb/Driver.cpp
      storage/ndb/test/crund/src/crundndb/Makefile
      storage/ndb/test/crund/src/crundndb/com_mysql_cluster_crund_NdbApiLoad.cpp
      storage/ndb/test/crund/tws/tws_java/README.txt
      storage/ndb/test/crund/tws/tws_java/nbproject/configs_sample/server-dbg.properties
      storage/ndb/test/crund/tws/tws_java/nbproject/configs_sample/server-opt.properties
      storage/ndb/test/crund/tws/tws_java/nbproject/private_sample/config.properties
      storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.cpp
      storage/ndb/test/crund/src/crundndb/CrundNdbApiOperations.hpp
=== modified file 'storage/ndb/include/ndb_types.h.in'
--- a/storage/ndb/include/ndb_types.h.in	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/include/ndb_types.h.in	2010-10-20 01:10:11 +0000
@@ -46,6 +46,18 @@ typedef unsigned short Uint16;
 typedef   signed int   Int32;
 typedef unsigned int   Uint32;
 
+#ifndef INT_MIN64
+#define INT_MIN64       (~0x7FFFFFFFFFFFFFFFLL)
+#endif // !INT_MIN64
+
+#ifndef INT_MAX64
+#define INT_MAX64       0x7FFFFFFFFFFFFFFFLL
+#endif // !INT_MAX64
+
+#ifndef UINT_MAX64
+#define UINT_MAX64      0xFFFFFFFFFFFFFFFFLL
+#endif // !UINT_MAX64
+
 typedef unsigned int UintR;
 
 #ifdef __SIZE_TYPE__


Attachment: [text/bzr-bundle] bzr/[e-mail]