From: John David Duncan Date: May 16 2011 5:21am Subject: bzr commit into mysql-5.1-telco-7.2 branch (john.duncan:4172) List-Archive: http://lists.mysql.com/commits/137374 Message-Id: <201105160521.p4G5LpVn009005@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0296983166==" --===============0296983166== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/jdd/bzr-repo/working/cluster-7.2-labs-memcached/ based on revid:john.duncan@stripped 4172 John David Duncan 2011-05-15 ndb_types.h is available; just include it. modified: storage/ndb/memcache/include/ndbmemcache_config.h === modified file 'storage/ndb/memcache/include/ndbmemcache_config.h' --- a/storage/ndb/memcache/include/ndbmemcache_config.h 2011-04-21 10:45:07 +0000 +++ b/storage/ndb/memcache/include/ndbmemcache_config.h 2011-05-16 05:21:20 +0000 @@ -15,26 +15,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -/** - * @file ndb_types.h - */ - #ifndef MEMCACHED_CONFIG_H #define MEMCACHED_CONFIG_H #include #include -//typedef Uint64 uint64_t; -//typedef Uint32 uint32_t; - -//typedef Int64 int64_t; -/* -typedef signed char Int8; -typedef unsigned char Uint8; -typedef signed short Int16; -typedef unsigned short Uint16; -typedef signed int Int32; -typedef unsigned int Uint32; -*/ #endif // MEMCACHED_CONFIG_H --===============0296983166== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/john.duncan@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: john.duncan@stripped # target_branch: file:///Users/jdd/bzr-repo/working/cluster-7.2-labs-\ # memcached/ # testament_sha1: b04d42a35db3e9295de076419483418485f87c37 # timestamp: 2011-05-15 22:21:41 -0700 # base_revision_id: john.duncan@stripped\ # 021t05e5v9bddnra # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSQhH74AAXbfgAAQUGP//1YQ AAC////wUANVuveam96Ga73hJQUwTJtKZtRpiE00yGJiAGiCaZqnp6FE8p6nqaPUAHqAAGSDSeo0 mRmhR6JoGgAABtSm0VPQyTym0noCPSNNGCGAEkhU9PSYKNhpQ8kNqekAANJ4jZROmDCSkRW5hBXW a6zJxXXcZmW3gE+HwMzGRq5pKcO/Hn+vo55NsPDEZaZLXXQ3prEY3XIqnOwjT0rpjubJnCINM1eH SmCEBFXqc74Mu7WIDkCI2QtBwhmggeeBavgvxJDAnRVNKslQvZiJCnq070UUipR2rcpAnf8Cmsyb EBtEhFYgxklrex8oFPmq0G8VWWyhWZvKD5CBVu5+hYBIpsIibBC5lWzxUp7iEOzNYMwmKQQCwQQc rGE9uSIlsYoJUPWN40IOEhMAyMjkrWlRDD29oq78XSIeBEWpheC1EZLE28MAVg5wMUQY6nWAqD6g u6JS8tldpIYAqDSeLW7DwyxBSFJ70vcHq/eEuJcwUHR4NXKoaMTFnhBgbpXCJyS6IoZ42DbEVhA4 ZmAr5oRGmKrMO0V+25GSRGDhtV5SSRDASqSncMN7Qp1I5M/PlEkMoCD3rD+hDYria8YEnBbjSXcr jIvmDXQRWyxIiseG/hrbbQkTbs9SPJR774E5u1RPTbrcsxex6a93rsRIZH8HQC1IoUL3bDrlkvib jMhQVH4CboSuz1+9kbxVErUHGSqxjCLTLXeZVNZYI3vGJDMZbYDy59Fy0i9KN98LTc2tSUg2tnLV jBlnsa4UzMo7NIBieqYrMuduzDUYTkwSJuF/HCHSBpMCkivGvk5hwMi2kwszEeYVEQn83KdnUzpF RC0iT3+/FMyYkVYxOJS3Qzp1DN4u0OiEsAbN+2Ze5QM6eyMjUVwO8xbxsQqCp3cy7OloiG4NuMLL 6aIrJI8TNVBGlVX1lbE80B7p4UuEOHiHmsiCd0SttbySenAaTCJ2GII03Su6dUKxInRxcpj9EaBt XW5WSwuZk4rhnNslsyFjeERGiYNYArw2CXGRdN83wZDRz14urPO0gEUaot6JICiXV0l5F/B7mB5n Ko6rq5oIARKxuMt1aukNgXHSXzAEGPk68hc1ZmTNQNFdUYD1Wm9jTN/C0Ev+LuSKcKEgSEI/fA== --===============0296983166==--