summaryrefslogtreecommitdiff
path: root/sql/sql_string.h
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2010-10-19 15:58:35 +0200
committerSergei Golubchik <sergii@pisem.net>2010-10-19 15:58:35 +0200
commit745cc74c3301f193c7b82c31d11c3bf0c842be9e (patch)
tree4aa6101c051c91607d2623eed26fb41527fd0bd3 /sql/sql_string.h
parentf0c6576b85a57ec82fd911f73cce7c99683b378c (diff)
parentcc6d22f5356e0969d8d5d1046edc69cb17ea19fb (diff)
downloadmariadb-git-745cc74c3301f193c7b82c31d11c3bf0c842be9e.tar.gz
5.1.51 merge
Diffstat (limited to 'sql/sql_string.h')
-rw-r--r--sql/sql_string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h
index 9e22f7b6a27..6eb0d74fde9 100644
--- a/sql/sql_string.h
+++ b/sql/sql_string.h
@@ -102,7 +102,7 @@ public:
inline uint32 alloced_length() const { return Alloced_length;}
inline char& operator [] (uint32 i) const { return Ptr[i]; }
inline void length(uint32 len) { str_length=len ; }
- inline bool is_empty() { return (str_length == 0); }
+ inline bool is_empty() const { return (str_length == 0); }
inline void mark_as_const() { Alloced_length= 0;}
inline const char *ptr() const { return Ptr; }
inline char *c_ptr()