From: Martin Zaun
Date: November 28 2010 11:04am
Subject: bzr commit into mysql-5.1-telco-6.3 branch (martin.zaun:3352)
List-Archive: http://lists.mysql.com/commits/125253
Message-Id: <201011281105.oASB5FYW016655@rcsinet13.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1443927448=="

--===============1443927448==
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/ based on revid:jonas@stripped

 3352 Martin Zaun	2010-11-28 [merge]
      merge from ndb-6.3-duplicate-symbols-fix to ndb-6.3

    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.", 


--===============1443927448==
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: 6831ad6509a1b6a1b0610522562eba912b8adba8
# timestamp: 2010-11-28 12:04:46 +0100
# source_branch: file:///Users/mz/mysql/ndb-6.3-int64constants/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYX40u8AAktfgAAQUGP/91IC
ABC////wUATyz3brcm1dSoN6dbuEkhU9MBTZRp+lT8KemKbSE9TRo0wlIEYmTJqIGmQGTR6Q9QaB
JECnqp7JlT9U/0mmp6pp7RTTIAADapTyaj1HqA9Q0GQGgAABJKaGiYnqMp5qGTVPZRqeIRpkaY9C
ZrKehXWqlUZli7BNalqEatZFgs1Eod9fCahSjPimjS8djGzpquGKayAZ8uJy5iz2Kus/Ru5SXqOc
qaUPMceiwe5LMjxdMWAjAMiIbL5G8jJfA38LzxuLAvE58whfxPEVEk67tgwgs10nfppJJrx+o944
IdIL29JwMDYkFxZ0GUpHZqaMVVoo4IoK9mFRMQQPMyUEQmCpBgFWo4JwQ4lJkQM7x06PsTmaIQNa
K7iZDV6v3yrCiy9qyVYyZZZxzDdVgUfyEiWcom42F6ivZ2NIpB8I2gLYuy1nVJxIkVC9g8ikwQYE
yr5cbz5sorM7Tc4WjWlJ1ZFSBK0R2XkS2mE9TbafDJY7qezNyMygYoLkmOwZwT+s1REMnsvyN5QO
aUL0Cb0ZZAWI/hEn438H20VmxtQ3kqvjc5YIIwyspLzyB0vomNuE064KtOad2YymPOdG1sY3Ot4Y
oGCk6Bcg1nKLIb94Axu19rjpubZGmJF2x2RhUcXNLbYR66VXDFJoE+Dhdxc+DbwYbFkmJYTKznzY
WJKH4UMI3L8Yp1I92A5QqPiNAsNIzTIJuQTzhMZDEBpKgqTGPCtOBClq4h1PfsOXdTJLN5UzMDHx
JkWFjxogQ0r5yUHFnOBp7d85E+/ySXQjw4FbiaVg744ETWsD+DxBOmWiYu+S5JfnrIYo6FtrR1br
OalrmNXHesjHfRaCphtJP5111WWGS+rbx87DJKtREio/si6e2pwhC0veXX9jcX2h6SUImrmLh4eE
5KmE7/mU9FMdtuwuEM6uv17J4B5l/6wfbCD9peY2N8u/SDxiodVwS3ifn3y692nj6Z3kYuPiG1LO
yVRdN4GtbjB39HhlgyzEyLMuRl18zQcSjD0pAkOK26BZJnXd4CJpI1C1dJzOb1dT7Wqg/3rvJmSo
JjigzkVAwxjdyQNs2lC6H2NkKmdYoIULmb1wU562d01pSewMQoOaY9VrFOCLDYBIIOgpd3tiYDiK
WxKI8ddsR1zkFSHkclyqDmEReFWrz6FkA5KB4TjwMKdVVpJjuuOBoZvKhhIwTH6lV6+hw0gMSSYm
iPJVyraGKDIqOJIXPHr7FRvGVBO5wkOKUj4TxSTHZlUmKsWZm2hIbIuOKqwoshhcfx1bVTy2EuVY
YmqZJEAoOCcX1jAiFd9sVLkSwb04c3XuWnQZkRVDRUuTyIugbGot/DUJCRmNdECpuQU5NZ0evIhg
QkVBE5cQcXovApNNyNalaxZqL0mxUp1ZNpq2gpxTinu5hnCPcWdC3THVB9gmbUpsMRTliPO41L1Q
25HmYg4IvQZFeQRCEz2izK0JPysSuiU5SrKcwCDxsRJ1SqNwaWwFZilFdPcfWHM2INwZHb1RGA1K
zvCAUinfBPXJbi7LqXdEliVDykwppPsXckU4UJCF+NLv


--===============1443927448==--