From: Martin Zaun
Date: November 28 2010 10:57am
Subject: bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3350)
List-Archive: http://lists.mysql.com/commits/125251
Message-Id: <201011281057.oAS6k7Nw000708@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0017782675=="

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

#At file:///Users/mz/mysql/ndb-6.3-duplicate-symbols-fix/ based on revid:martin.skold@stripped

 3350 Martin Zaun	2010-11-28
      ndb - remove duplicate symbol _opt_core from atrt-main.o (defined in ndb_opts.o).

    modified:
      storage/ndb/test/run-test/main.cpp
=== modified file 'storage/ndb/test/run-test/main.cpp'
--- a/storage/ndb/test/run-test/main.cpp	2010-08-03 09:16:27 +0000
+++ b/storage/ndb/test/run-test/main.cpp	2010-11-28 10:56:59 +0000
@@ -76,10 +76,6 @@ const char * g_dummy;
 char * g_env_path = 0;
 const char* g_mysqld_host = 0;
 
-/** Dummy, extern declared in ndb_opts.h */
-int g_print_full_config = 0, opt_ndb_shm;
-my_bool opt_core;
-
 static struct my_option g_options[] =
 {
   { "help", '?', "Display this help and exit.", 


--===============0017782675==
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-duplicate-symbols-fix/
# testament_sha1: 04cfbdf5a81fab2505b89336e5dd78c98d3a0cb3
# timestamp: 2010-11-28 11:57:11 +0100
# base_revision_id: martin.skold@stripped\
#   ehn9p6co4rykoihy
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb25wIMAAV7fgAAQUGP/91IC
ABC////wUAOV3ve1qe0O95Xc8JRICZGTTSPTAp5qZNNGpkGgZIjQyMmk2lP1JpmTKGjQAAyTQFPI
1TankNJoehNNqBkAGSEJhND01HqMTTQAGg0MJKj0QMkE8mBR6Q9JoNAAfIdYeIvEBjbFoxQhTFOW
rc6zOGkkRB16D4oqe1dqULZAdu+Z39M0JYPLLVHlIqvELldeIxRLjjSyEmEKbGp7SikXBPT252g1
B1q5BUYSVHak6AihJYHsB0TKsCoyiJRDolZiUjxMx2ycJpU9byydooeZuEc4hvEt7iAxZEB7Zwtn
MdD6i499JceceNKok6x0LpYHxCbAFBmEg00mGgWT3vUBMc5Vlt+GRong7eDO7fMfNOmJ+jysoOyR
TjG5kajsreJnmrsWkidRA2IpNgTwP9eBcNhqA2sFyoA1GrZw5ZU3Mq5xWYoYg4Z0xqZt4FAusyLG
bhBTo1cLMdgMBaDk0OsxtBtbrjV4xYoTCr42PoFtAnjclNYNaw+hzmKkoboHsWyMRFyV8ZFtlk6s
qi9qOBvYHve0oqOEAIPTMacr5JTUeHtmpaTyfoQoOjOdKQRoK4Z8nFWAYMHduykN+ZOwK94m4k4N
lkdbGh5gBMBeH1vROuTCovJm5OmBKYOm4sr9ZgNXrTws5DgP1/cuCIS4yJDfxR5emgxfAYMw6B+V
51ZAjkw8miOBu3fb40g1w1kds25dBgFZrRvY52tPVWXOFwjZG+hxO2lOPSZvvOviH4uqSPnM1fH4
ws4qWoqR1csm32uiwAxGUF+ycZdkt9pa4cM5DYfueT9lQmw0EtfI1WrESiKQ+P4WsIXkpElgSwmK
x/XbmLNs7ossNop2TC9MXSScAlEegO3dM7mvCoL52sqR4aSqm0yMoXB1MpcLzUAsCdXQIYDHISg5
h7ra4pEANyy03hYRmPibhNtgxB2z1BguhAfxj2IIvVQSsgB1LGkp4yeBILirkuoJiSFqFDPqNZwu
yN2bCiuAMQOSiocTsIhrxmthobwDCqw7i/SiFgieIpiqBigUyxnzTqLgDglGkSyUNfew6blqrpEh
7kPmdrxbjGw7pbQEsSFOjWrgkQRBFyuc9nZ8Zr62iPcn37BXRnB3jGUP07eptJUiItStEAoc9ljv
FNhtF10ukSoeNUJ2px2xVWAadCbIsFic/MgW5wVioscmVhyXIt70sCAw6bnD/F3JFOFCQvbnAgw=


--===============0017782675==--