summaryrefslogtreecommitdiff
path: root/storage/connect/xobject.h
diff options
context:
space:
mode:
authorOlivier Bertrand <bertrandop@gmail.com>2014-10-22 12:02:46 +0200
committerOlivier Bertrand <bertrandop@gmail.com>2014-10-22 12:02:46 +0200
commit554746afe321650f02e45b1530af19aea4387cb7 (patch)
tree2b6616108b4d5a738876859d05b823c5bfadb5a1 /storage/connect/xobject.h
parent56e27713213e5b0f7be6b3ac01f06ee26584f38a (diff)
downloadmariadb-git-554746afe321650f02e45b1530af19aea4387cb7.tar.gz
- Fix (gcc error) passing cmd instead of cmd.Getstr() to htrc
modified: storage/connect/myconn.cpp - Remove an unuseful test (gcc warning) modified: storage/connect/myconn.cpp
Diffstat (limited to 'storage/connect/xobject.h')
-rw-r--r--storage/connect/xobject.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/storage/connect/xobject.h b/storage/connect/xobject.h
index 4624e962c38..bb7b0150ed8 100644
--- a/storage/connect/xobject.h
+++ b/storage/connect/xobject.h
@@ -141,8 +141,7 @@ class DllExport STRING : public BLOCK {
inline void Trim(void) {(void)Resize(Length + 1);}
inline void Chop(void) {if (Length) Strp[--Length] = 0;}
inline void RepLast(char c) {if (Length) Strp[Length-1] = c;}
- inline void Truncate(uint n) {if (n >= 0 && n < Length)
- {Strp[n] = 0; Length = n;}}
+ inline void Truncate(uint n) {if (n < Length) {Strp[n] = 0; Length = n;}}
protected:
char *Realloc(uint len);