From: jonas oreland
Date: December 14 2010 12:53pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (jonas:4058)
List-Archive: http://lists.mysql.com/commits/126757
Message-Id: <20101214125336.B7737518876@eel.localdomain>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9083125717108082224=="

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

#At file:///home/jonas/src/telco-7.0/ based on revid:jonas@stripped

 4058 jonas oreland	2010-12-14
      ndb - add constructor to BaseString for non null-terminated strings

    modified:
      storage/ndb/include/util/BaseString.hpp
      storage/ndb/src/common/util/BaseString.cpp
=== modified file 'storage/ndb/include/util/BaseString.hpp'
--- a/storage/ndb/include/util/BaseString.hpp	2010-09-21 07:36:08 +0000
+++ b/storage/ndb/include/util/BaseString.hpp	2010-12-14 12:53:32 +0000
@@ -35,6 +35,9 @@ public:
   /** @brief Constructs a copy of a char * */
   BaseString(const char* s);
 
+  /** @brief Constructs a copy of a char * with length */
+  BaseString(const char* s, size_t len);
+
   /** @brief Constructs a copy of another BaseString */
   BaseString(const BaseString& str);
 

=== modified file 'storage/ndb/src/common/util/BaseString.cpp'
--- a/storage/ndb/src/common/util/BaseString.cpp	2010-11-28 11:34:01 +0000
+++ b/storage/ndb/src/common/util/BaseString.cpp	2010-12-14 12:53:32 +0000
@@ -54,6 +54,26 @@ BaseString::BaseString(const char* s)
     m_len = n;
 }
 
+BaseString::BaseString(const char * s, size_t n)
+{
+  if (s == NULL || n == 0)
+  {
+    m_chr = NULL;
+    m_len = 0;
+    return;
+  }
+  m_chr = new char[n + 1];
+  if (m_chr == NULL)
+  {
+    errno = ENOMEM;
+    m_len = 0;
+    return;
+  }
+  memcpy(m_chr, s, n);
+  m_chr[n] = 0;
+  m_len = n;
+}
+
 BaseString::BaseString(const BaseString& str)
 {
     const char* const s = str.m_chr;


--===============9083125717108082224==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/jonas@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jonas@stripped
# target_branch: file:///home/jonas/src/telco-7.0/
# testament_sha1: 351328cc7bda8932ae37789d5177a1ab0d1df7fb
# timestamp: 2010-12-14 13:53:36 +0100
# source_branch: file:///home/jonas/src/telco-6.3/
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcz2QwQAAlDfgEAQUH///1oH
igq////+UAU+9u55tQ1529KJeiukJRQKemU8mJlPFNgo9GkMmg009RoNACVATSn5JtAhGaJk0eoe
o0AABoeoMkGlT8ieRT0Q9I0GJ6gAABoADFTTU9UYACNkAABHkAAACSQg0CYEyNTEZBpGmSAAD1Nq
OFn8WGsox+n9ZbzFvsUBntc+pw1w4mUo/OywFoOT1aBMZC6TSBAfBAlRjmNfGN0A0ieEkkb8hHae
rZcXQ20srAqko4yy4u943WyMqvyxoakmjBXMJPNfqBn0PX2/JiSW1YYL2x0Ca7H0ragksEkywYyB
4pL7k9G4jhbtPDzxQ9kGhUYtZP27VdfKfRjN7DvmBeHuhe/ToHi/xK9O2gzWPEnwkjjAS2iyvVdH
M3HGkaVHFhXsQAzic0gtIK5hMB4FrzYE7ovJVAHGRQOuD2rXdAF/AhB75mmQUaOVYuetAkqoEhwA
xVNna/X8oIbINCCOYEgaZ4WBeBj1uyz1JgVsqKnFBEyaAFBRSAyaixAaQQo8TSG4JAHj07HPdpKS
UxyeiFZrLpSWYmloypgkDO6lwDgUY99bR6yEDMRwGNnaevcEEioYCh4WUDvWocqTXgjLrIUkindI
XBc3LhwvINssUR1PC3ADEyHER8i507Znr02eBxNa5nVFdIXFRDfbs35hQYJj4OBGpmgZzFdeupvL
B+7O+0iK7KoNmBvHElnfnGUD4LdB90r3BRcnwLXldBOM7hnkMqliEaJloRJ0DNpmPGel03iQaIKM
tcKRRxXZNcNC0q2T5Ku+9cqtj58MGmk2pPTSsDPaCiiWYWrP0cI33oTqMMSAQRzVpySEgVSGmCIR
M0Al0pJBJM/E4M6MbQeonwW90+e7gUcon0JxF1lIOGJENKKvBoNYiSA0R2WnHMjUs0i23yv7Z6UI
ViIruiRSPQiVJfMVwXj2fxvC4wMfvIncvMnPUJz02nUiW9P8jeia2mTs5khHim2GDcQlNdofqHfY
1O5ddvESbJxHxpOnYRz1Owt16cu44Hdl3FQSE4OpsS1GmRBZyGlzfEio3qIDyJE/M3h+NfhU+ju7
/wNMzqWnTJubO1FaUJTFeHKVPUZix+uVSmSPDPkzTLl4sGqKekDUUoNpiihRTPk3+x1MqiUIpX6A
RRulqnLeUwYD9Tk4z3LfFRKF7neeRcy+X66joIOzonR7wLDxwLJSbQgbxMEyp0OXU81KLBETTTgW
dfmi90JtDJOLhMPtn6ornSNeeVqZCEmQ4P0F7gVcNEl46bCETExRRiOIbreXYk6EBpMukRLgkQZY
dVNqjgjqVG0w7qlee5xE7XbBXDclXzAYCkhpsPkTdkxSZgPjOoAV/US+KYqpUYjBv1hrQqBgQkrJ
EQiWQXnSFgoBqwtr0rACVcGU7BBy7F5eTX49pVRHuJthMAZgPqQ6RJfWRfagdXWBS5fc9Xd55kBV
XimzI7mGDniTL19gK6c7WGJ41HtNJaZGiquEuZSYO0ORsVTmZ2q5j3wS4yY4nQLsLzLPHcJES6wZ
nLe8LN45w07eDrMR1gwEtue8WVzgZZ2GSGIkQ29F6HozNzEpq/AapFQ4IMGYojja3YA1RWElymS0
zQC+yx2TNnHk+p+yhCGL4BwzDM5h87wpyNpDiapxdN49tPkbTUpxJ1fYitscLfZbzxwMTdEDeyIT
jHl1GtLVxkYSgPmo+nFSBY8oOXcpST/F3JFOFCQzPZDBAA==


--===============9083125717108082224==--