From: Martin Zaun
Date: October 22 2010 12:55am
Subject: bzr push into mysql-5.1-telco-6.3 branch (martin.zaun:3316 to 3317)
List-Archive: http://lists.mysql.com/commits/121592
Message-Id: <201010220055.o9LEQbgA017730@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1377510394=="

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

 3317 Martin Zaun	2010-10-21 [merge]
      merge from ndb-6.3-int64constants to ndb-6.3

    modified:
      storage/ndb/include/ndb_types.h.in
 3316 Jonas Oreland	2010-10-21
      ndb - fix a (very) sporadic crash when event->subscribe() is performed on a table being dropped. Seen in ndb_binlog_variants and autotest

    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-26 18:53:34 +0000
+++ b/storage/ndb/include/ndb_types.h.in	2010-10-22 00:40:27 +0000
@@ -50,6 +50,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__


--===============1377510394==
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-6.3/
# testament_sha1: 756fb663f810cd296cbf1970a3204398c017adbb
# timestamp: 2010-10-21 17:55:37 -0700
# source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRifFtIAAoFfgBgceGP/93Mn
Blq////xUAVZea6pVa5Ra0MijCShIyJ5qNTTaaTynpNPUZNNMmmmjQaDTQCUkNMIxSbFPKaepoAA
AAGg0AJEiZJok/KaaB6FPU2o9Q0ZNNDRoZNBoHMAmAmRgBGJiYTCYIaYmmAkkQ0aCYCaZEZKeJp6
TU0PU0DGoAWLOr9NGfb+HWdmPEcty9PC8vK6BqsiSRMY9VsSKS3LfQXLUsnh2LH5cTbO7tX5lO1T
uJGE5Sipk7W24OPxhgdugHOZJ8U7x1piJbynpsckpHT2g2poqUFsx4qnyH74JBsfULEHELy88yPE
pJjDjx4j+QuXDUN1GApUl3WKvsvSXNah8n20Odb6TCuGsAMWQh6SDFBjPQkSGFduiY5wiqIhkGn3
bXs/3rpkvWuIFlFQUpBFkg2C/mR9cROFISkZyf2qw0KbDNiZE9YmkrK71q7NvjoqcD4XRfKRLlnu
dQaRKUCqUHQVAGKc0HqMDPGSDJILfGbsIRKHzmsYiJqjWwylzKHmrBginDphw9q1Ei8wZaHFG6x5
FhbFAyEhdMuFElhCMbf83XBggqZmhgkUpVXCuJCUvQRDfIGTrSKVE0psKqExSxBEJEx6BMWRF/QP
HRZZgTkxIcsSfIlqNhTPJRKOdi1UWYBn1I4hJ2ZrfbxYZhmyar4HuNtAWxkE2UhZnfJcIyH3SXzz
G/Qg1i4VFKxKTFaGJB9LnyqJa72xnSY/sC9FmVuayJDLtlQWEMiBn9gnXY4wjhbAoxvqDhKdQlQN
WPrHYD3pMuJTKjsOMTEyFWLBoZUdimKlRnUqiFJZtgOY7/NupL6CZJfVKFLDMDH0d6oMDpMHz5yt
GfbmnivP0ZwFeYGk+hLQItWjhvSapPsRMUX87EmYfaAcq3CxZjQa0DVmEzJlG2JtJFZGP1QdWnyS
XwogW9cSZL5n4fLTQlGMN9gHuLUlATJ7H9mCS2XAmkBYCbPYRPPTEOhihYcGxeRRgYakcWse8wVB
YWx0H7KXZxlFlpCNSUG1CHnEZKCg6EwxSNvYyOW/WbeMv/tRyBVGh7iEIWoP6TDdts5rzYV+KZ0W
LcWVOnnH2FIs5tbHgF7m2vmk+krsuWU2hr4ZP0GOY7dBKTybMeWnN5M2j2Fd+DbZNOkBQ+sZDdSD
ds8SQbVqXgJosjpvNLr5+hfvcuhAKuCBkog8kW5ZmGPCRnufen4S70VESvsnhjTch/ZclwKygVy0
sNkKy2NadwPJ3oOKC47ioZuwVUX3BcbKilkHiLV9BuPzBiBYLork8L2LmSXhP5imC2SJ/2piSmQG
CXQuDUkj7xdwoCoFw6tsTA60vE47Ql5C5AVirGcBOKg7KEkxmUYHacNaifuuBHgxt+p/A2YMOdxO
iMUGE1nDWXEya4ZdQqcAyTY0ky8cSSUGditJpStb0xgX5VyKq2XEGFTcEplCBpPMQhwnyk/SftCG
l0JZ20SRzpA8BOHqEqh6V5pKwByNnCrr0Oa+0W/gMyGnJVMeqefE7+UbYmO4uJRUmqCl2vAHCRmP
cwHKk7jBQJJkOnzrleSKhAU5+AgU7X6mqCleSI3s7bMuOtKLDnY3zeh8mIqTcxuKhVvdtMbrXwDZ
468lB7iwzORIV4lQMgJZwKAHsLExWMfLmcCtARj1pSuQSYgFIvINQl3itXeHmnVESIM4VJmtBTHO
33pJ58RVmCMudf+LuSKcKEgMT4tpAA==


--===============1377510394==--