From: Date: July 3 2009 11:49pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (jonas:2934 to 2935)
List-Archive: http://lists.mysql.com/commits/77953
Message-Id: <20090703214937.766E191B651@perch.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_uKAGkD6FJc4TDxOi5gPw5g)"

--Boundary_(ID_uKAGkD6FJc4TDxOi5gPw5g)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

 2935 Jonas Oreland	2009-07-03
      ndb - fix ndb windoze warnings

    modified:
      storage/ndb/src/kernel/vm/CMakeLists.txt
      storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp
 2934 Jonas Oreland	2009-07-03 [merge]
      merge 70 to 71

=== modified file 'storage/ndb/src/kernel/vm/CMakeLists.txt'
--- a/storage/ndb/src/kernel/vm/CMakeLists.txt	2008-11-16 09:15:35 +0000
+++ b/storage/ndb/src/kernel/vm/CMakeLists.txt	2009-07-03 21:49:24 +0000
@@ -36,6 +36,7 @@ ADD_LIBRARY(ndbkernel STATIC
             WOPool.cpp
 	    GlobalData.cpp
 	    SafeMutex.cpp
+            Ndbinfo.cpp
 )
 ADD_LIBRARY(ndbsched STATIC
             TimeQueue.cpp

=== modified file 'storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp'
--- a/storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp	2009-07-03 11:13:59 +0000
+++ b/storage/ndb/src/ndbapi/NdbInfoScanOperation.cpp	2009-07-03 21:49:24 +0000
@@ -395,7 +395,7 @@ NdbInfoScanOperation::execDBINFO_SCANREF
   if (ref->resultData != m_result_data ||
       ref->transId[0] != m_transid0 ||
       ref->transId[1] != m_transid1 ||
-      ref->resultRef != m_result_ref);
+      ref->resultRef != m_result_ref)
   {
     // Drop signal that belongs to previous scan
     DBUG_RETURN(0); // Continue waiting


--Boundary_(ID_uKAGkD6FJc4TDxOi5gPw5g)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/jonas@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/jonas@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.1/
# testament_sha1: 8162dd6dd6e0b6ac83703c17df7866cf7e79d9b5
# timestamp: 2009-07-03 23:49:37 +0200
# source_branch: file:///home/jonas/src/71-local/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWeCk8IkAAgjfgFBQcWP//1o3
mAC////wUAS7t5yHo9aD1tpenbwkohpNEzKbao2mk0epsRpqGgAaA0CUiCbUzI1MU09E3qh6jBBk
ZNA0ACUmTVNop+pplMaNTQBoABoGgADTUKYgeoANAaBoAaDIGgAkkRoNBGJk0Kn4mEyBR6j1BkGj
0mFywXRrwqa/YvyZYDpBIJXClpZouCRa+U9rA5GsRhwim77KRCkCSSnaNBKx2g1SwskqBDRK9H9M
Hdopnawdw0QA9gEj+Xjo4X3Txcmar6mxxzEd7aXgNpzQJL7nMdDv6NPyQ3DAqrTe+g6xlbFy+28e
BeXbX8cy1kiLn3p3DM982Box2TpD2bszdSRyAeMWEAT9hrERxkuGURNmhJZSJcZ6jTpxISpUphCO
dpqtlbSGUgabSl7MhaYjUPjRkZQK3P0mUTcq7rntVppI6HMCcdOXS3YCDA0kiFAnLAJB+sxHFYyO
xkSFYFb6KjVJEYrJJEik1jErE7h1lBaYDSJwQpNoFpScFXiPstAslKgeTkSRPrziq5wNinKio4nz
0lntbE3HQe9RHHxpNFujWbRozVQChiFeeackWqkrMkbp6sJMZQeNLRprmUw0I19DaQSBZT7THAVp
fg4gXg20mkJS4hiBfIdJj8L3Nrc1yWJhs0kE+uZis1G8dsAwnq0MJc6Xa90wEmRJOnESo8jjgSGK
oqWOOoqcnIksWtEOJ39ClkvVj37ZzEHEiEhV7WCiP8k00VuqDhVCxd0ogemNBBIMjin1Mkd8R76f
N6meMeDJM9/Wz0ukCs7+RSeZkTi5HI4kD2/qYYSSoggSO46LErtwSviLIOAtYglCMRTO/nHjzUVD
xiQHnseRz7GZ3L517X83mrqlHzLDHgXlxQZH+7yb82342umGo4rbgJeLFpTb0I4NSeHQCYJQ6u4F
oGp5/jJmCowdVHLauBLRyXbEyncN0XWw3mQE0WpXyQtwXetSpVkSrYVnPkXkP+4rllg/S4sHn6ph
a8YTKe9ODcUZKggyB8yJMgu8Tx+LzHuYkxMbTIrLAgTjKpsnmWmwI6NCgTDLiuisSIrK8kMNgzfg
XSenTUDcRNz0PW0wRy8IdVzLbvkCBBPxzAkM+osW5En+OaPBiYigMaB+aWxmbjquOAsFHsBffAcB
yRUwjEOr266Vr90J494XSWs52VJcU27awpljJ+rMJadmYFBDh5b+yllVq387zPsWwpWP2QppVFkQ
YLEyFfqhHI3urUtlA4wzpp+MMN7eyKiIrkQ5grWqDOydMwanxJJwL9/gW6OUYHfKgxKpqaT6YS5d
FKz1VBjlTqD7sGcY4GUYjfvPYhX/BFhbTzGgg6OUweB97aQOKNerMWQRqnmipK+OQOVzBA4UVKMs
oupCIIuggeOcGUVmvBA4nDxWxCeZE6nR1MJqJTtC33k53eso3IaAYetz9ztoQyiPKVcB1AdFBUDM
QYL8VvgB6yl2cyz6aBw9eZFUxHAWi23IEPTXVvlMchN2DbqaNijPfsDgY4YEGWHUAqrKtBF6Ua69
NyaLS9U+A/xdyRThQkOCk8Ik


--Boundary_(ID_uKAGkD6FJc4TDxOi5gPw5g)--