From: Martin Zaun Date: November 6 2010 12:24am Subject: bzr commit into mysql-5.1-telco-7.0 branch (martin.zaun:3951) List-Archive: http://lists.mysql.com/commits/123007 Message-Id: <201011060025.oA5MfEFO027325@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1824604320==" --===============1824604320== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mz/mysql/ndb-7.0/ based on revid:magnus.blaudd@stripped 3951 Martin Zaun 2010-11-05 ndb - fix compile error: 'NDB_TRACE_NUMA' was not declared in this scope modified: storage/ndb/src/common/portlib/NdbNuma.cpp === modified file 'storage/ndb/src/common/portlib/NdbNuma.cpp' --- a/storage/ndb/src/common/portlib/NdbNuma.cpp 2010-11-01 11:45:26 +0000 +++ b/storage/ndb/src/common/portlib/NdbNuma.cpp 2010-11-06 00:24:16 +0000 @@ -18,11 +18,11 @@ #include #include +static int NDB_TRACE_NUMA = 0; + #if defined HAVE_DLFCN_H && defined HAVE_DLOPEN #include -static int NDB_TRACE_NUMA = 0; - /** * Load libnuma using dlopen, not have to put link dependency on it... * - handle fact that there are 2 versions of libnuma... --===============1824604320== 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: 2db9063601067a442e73f8ebf35d7e60698be629 # timestamp: 2010-11-05 17:24:23 -0700 # source_branch: file:///Users/mz/mysql/ndb-6.3/ # base_revision_id: magnus.blaudd@stripped\ # bvqaz5andtfsqxj0 # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQy9OgUAAXpfgAAQUOP//34D FhC////wUAN14B0GgANJqmTIyZlNHoI00eo9QAABoBTVPJHlB6jwoGgDTATTJtJkxAQiT9IjTTam 1MRtQNBo00aDCaMQcwAAAAAAAAAAJJJpo0BGCaaNU9DE1MQTRp6Gk2oxGsgNRpEtJB5jGGoBiWzA w5iYj6iwpiOAANu6cXtwyikASIXXXH6nz+HvGHp94hKq6zI0CDHKr1Eq64sjQQkyBqOP/FB7COHH kcVMK7Z+Yb98J79y9qFql+E5K5qH5WyoZjc1QnvQniXfUJw3l4IkXRhcdGTlTU+B8KPYjS6NORzo E1RTW5SbK6QVFbhyDA3aPSJpXy0Kiea+a6wifTcml1q2qsWJh4TEayN1r5C4pu3RTiTEE6siJykk fdCAziT9WcZQ5Y0xy3kB1g5Y0e4pq1ez8DW0yjCgIqkW/KZ0tRib++6UpuOpMWPHVkFKWEjKDmrp UXY0aZlYqNaircp47nC2YQ2ifQK8yJMWN5biU42KNZSxXMcMq3y0wo8aVsIEDmKZ7aWioNVqnUTV IWBAYWYhdwNEsQbNhAspKUGc4ElSWSYdMWNInOwDR0MmnaUeE07P+JcTX2G+5cfpp0lSlX3PUnqY Zm+5/vmepL6n5PO/6+xf0/RIUEKjoeeFmbIdl/TyrNSA7Ndxxk9PPy6+XZK30ljbKixfPbtfOqvS pHOKXvFyjBfval/FnkW/I3Hz0Fuu3E475eg5+n2UDr9V6ItqLTkayCpJhP94dxwja13rIlsSLfHr zeplje+o+1XwsUE071kq95KdmV5RqozDzA8RxAgtVGc5p/1hjV4moOF4hpknZGyiq3KkBcz/8ar2 cUHqmVZZjh4a265kQgnXYb7vEruxJpjQqJz+c9hmxz2JqhXMtCowCWFXGlb3lplrI63t2TPyH7Z0 8uZmS/AVSfzHa+4O/kGtPSW/mosLMwDr6GYThO4Id6bgMkxjrd2nz8qxG/vHQVy/J/YztO5VyWm+ Iz3knvLQxI5OSd13DnpMcmngE5vrslUIeHxjJohmWh0Ui5ZYa6iUoZe3lCVjNLkihajl1vkVFWp0 8hYcGZQJzs79607V8J+yvt0GWrlrPYhcYQFHrtI2TrJ1tfzgUATIbjtTo10zVrZXEGmWGPdjooUF 9IU8E63hdm7mJ7uxgNdgdsE6ahs6hkEUUA5llPBX/SUkmTJM5U58zR6yDiuW2yMfFRFOtih3cxWh 9UnkP/F3JFOFCQDL06BQ --===============1824604320==--