Merge branch 'testing'

README.md

@@ -0,0 +1,5 @@
+master - stable, but internal only
+testing - bleeding edge, works in progress, internal only
+clang-profile - intenal, modified to profile the code for clang-profile-build
+clang-profile-build - "release" and tc branch, as we want to use our fast profiled code
+google-profiler - modified for use with gperf

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableString.h

@@ -254,12 +254,11 @@ namespace DB
 		if (bufsize >= S) {
 			WARNING(true, ("Attmpted to insert %s which is too long. Truncating.", buffer));
 			indicator = S;
-			memcpy(m_value, buffer, indicator-1);
 		} else {
 			indicator = bufsize;
-			memcpy(m_value, buffer, indicator);
 		}
 
+		memcpy(m_value, buffer, indicator);
                 m_value[indicator] = '\0';
 	}
 
@@ -274,10 +273,10 @@ namespace DB
 			memcpy(m_value, Unicode::wideToNarrow(buffer).c_str(), indicator-1);
                 } else {
                         indicator = bufsize;
-			memcpy(m_value, Unicode::wideToNarrow(buffer).c_str(), indicator);
                 }
 
-                m_value[indicator] = '\0';
+        	memcpy(m_value, Unicode::wideToNarrow(buffer).c_str(), indicator);
+		m_value[indicator] = '\0';
 	}
 
 	template<int S>
@@ -288,12 +287,12 @@ namespace DB
                 if (bufsize >= S) {
                         WARNING(true, ("Attmpted to insert %s which is too long. Truncating.", buffer.c_str()));
                         indicator = S;
-			memcpy(m_value, buffer.c_str(), indicator-1);
                 } else {
                         indicator = bufsize;
 			memcpy(m_value, buffer.c_str(), indicator);
                 }
 
+		memcpy(m_value, buffer.c_str(), indicator);
                 m_value[indicator] = '\0';
 	}
 

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableUnicode.h

@@ -200,12 +200,11 @@ namespace DB
                 if (bufsize >= S) {
                         WARNING(true, ("Attmpted to insert %s which is too long. Truncating.", buffer.c_str()));
                         indicator = S;
-			memcpy(m_value, str.c_str(), indicator-1);
                 } else {
                         indicator = bufsize;
-			memcpy(m_value, str.c_str(), indicator);
                 }	
-	
+
+		memcpy(m_value, str.c_str(), indicator);	
 		m_value[indicator] = '\0';
 	}