From: Martin Zaun
Date: October 22 2010 12:54am
Subject: bzr push into mysql-5.1-telco-7.0 branch (martin.zaun:3886 to 3887)
List-Archive: http://lists.mysql.com/commits/121593
Message-Id: <201010220056.o9LNEtLU001558@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0867324403=="

--===============0867324403==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 3887 Martin Zaun	2010-10-21 [merge]
      merge from ndb-6.3 to ndb-7.0

    modified:
      storage/ndb/include/ndb_types.h.in
 3886 Jonas Oreland	2010-10-21 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
      storage/ndb/src/kernel/blocks/ERROR_codes.txt
      storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
      storage/ndb/src/kernel/blocks/dbutil/DbUtil.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-22 00:50:16 +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__


--===============0867324403==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/martin.zaun@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.zaun@stripped
# target_branch: file:///Users/mz/mysql/ndb-7.0/
# testament_sha1: 86670f343da5d33f198ba49ec34dc2eb59504f7a
# timestamp: 2010-10-21 17:54:59 -0700
# source_branch: file:///Users/mz/mysql/ndb-6.3/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYrlXYsABBJfgBgceGP/93Mn
Blq////xYAc3vdvlPX2ddDs5ad5bWgA9KQkqaKbFMxR+lPKP0TNQIAAGgaaBoCSUNGINU8TTSeU9
JGmjJoAAGgNGgkoqb00NU9oo8p6j0TQAxMQBoMQAET0mqGmmmgNGIABoAaaaaAAAilMmo1T8Um1P
YpB7Sg9R6gDIMRoaZMQIpETJiZATTCMTIBIeiYgBoMjlgEtSll9e49h/D4mubNpGtdW9rdGqRrtM
U8XAUMgpKJSatttRJnI3uCFz5W3q5nM5TwEEEP7/CdckJgwpGUDZ0RKBmizBBhTPEAA1P/JiEvqi
lksNl3Hn2QksCBttSdNeRlY1Tva/pSiiywpF6CY0ZrW98Oo4gAzcB6V4RNq4uLxHouMgvdAZHho7
TtaDgPAvN+YZWaUKRHpgN5xNAj3O5PnPLjlKIll49+WsZQERnYyovVCgTQDUMABJ6hNleI5CzCEb
D09jdSgQUKEgO8ss6E+ObWy4e3hHLDn9vXHhqSOckLxtbwAugAO4dmds+XWhIaGlsm1tf02X6572
y7A0wFIEy+4f9cHeXZSu6QtK6qNKPPbSSuFElhvxs5HGBKfKFrgsO4TxG5yvzYrcCDBYDJUJ8ghG
CbAAVulCefXvaFRZkn4iEQwRhMpIp1F5IqE2VpgoKlNaQvEsjXF0XoGiRmMZFhbCvlphOGAf4Weq
5rZ0s2MYyrK7x6H53iMU4vqerr7KZx9mNsMRdBuwGSpVLCtZmwhpFuBvmOomGNDWJhetpWUWmRLU
XPAwN1cExoglYWKNcFcMoiIuQxkvUlE61F41RIX9XEG8bslw5x0mzTncQSb8TfRWNOqyDrqYZ5a5
kLGmN1+zKh7Na6rJLwGPI8WKZiaektvp7BbnRx/XYwzDNvaXpPMG1nC/dgyFsuUUeFA/LhrEpzEc
BknKje6jOMxLeSH1Dpa3Krxc1cEEVzkAOc5LqbcpZEnMNlfxsipUImO/ibJxcTLfPGUN9SldpgVc
DomEXqvNWEFBtM3QJj5KCkeNtcSXRtrnK2QGP2CEdmypPYq+24oO5cYkXE8bINTGaZDezoamKWxC
BKYkzSqRiYAhqYpShCqph96ZGq5uJcdZETIDafIj4NZxoQI/xdFsMMLB01cqGs3UDr6NVRHbKo53
o/Mdw64Dc/0XkEssO7sWoL+0TJ2GJvIUjZ8aAmPP3UAcYI9SZ8BJPmMcnw8THRVr9CyoZT2Y06B1
aBCzTy9sRrM1qekOFrBh33FycmFm8Xo+TlEakICcP1dIj8cAN71xejPYa/dTgUobmc/fv3UWs7Lb
IPqSmWnzDsNhD8ELeBm4YE81DglSH5F8BxVdB2BiYmibaEyiEwhUHySAvVxx3A8V5QoDIUDK8ysn
qdoCJnlvJ38cBWKyYCiFRpRsSlxsQai6jcuKZ4DdqZKtidDJk9gwK1GNUp+sTlqVG0icEvpwnaOp
gP4ZE1XjhNBnmufhZ7xxz2nUdZRgwHRlmMalHOLduBxrel+b166yTXp1Te+uVLKskEiwM14U6OuF
MzzbFELOrkSoIAJ8NjlYNpJMqpdIeTUN24SFLFm0ODp1hp1T3Ux3U76MWqVEiN5oiUPnKDiRRm2k
LkTdQd51nkJB0hsK0gtaUdKiEiT+C+mAbjAXgJnDvDIwUDLkJkNo3UaB0PnwC48b5CeQ2E7XO/ks
NbmA8HQMx1Q6SBHIVmpDEGagsPtudTS9QOhTo5l3BQWdB5jUONDb6kbw99SzMwd+lCYdy1HFDiD1
ZUMrBMGwbQ5FgjAcNgW63ud52ZHGdDUIHlDyc5+h9CNqQSkEiREuL0XtEzFCaR5NrQ0JrJnshi0s
M4IYEYcoQSJiMnQQhW0KTK4iI7CWUMpa7Wp52MjKVPksygxMiFIuJASQnSFfeVnU81r2GcrMWMg2
Ch0LgfFCTNqKQq9L9YjgDJcJIZMnW9w+w69jBAEVhSmJ8RnkY9g8Oy0pLHSYBmClC02iWktuxKkQ
yZFUI52u51poZ0Wo0mV5XJmFiLT1GgJIUVx5kDiQngzZZM8EREFpt7FJFJ0giCIOR0IOs2oWuEOB
chkJy3GIMMsypN02RnCtJVPA5Bmzb8G4YRazSDYpKEMHAdiGq08jiG1vRbbShPcRcJnEpNSJaPku
5fMcRsHO96+jILwtC1YkhcHlsHchUHPR6CMnkHeHiL3hLWY+7/i7kinChIRXKuxY


--===============0867324403==--