diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2010-08-15 11:56:14 +0400 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2010-08-15 11:56:14 +0400 |
| commit | eebecee7d3559281e30c13027f77782aec131f29 (patch) | |
| tree | 4738931efbb3d3e34d0da2612a5709eaa585b9ef /sql/sql_string.h | |
| parent | 7f8627e36bd77bf418dbec50f10566d5917d3a1c (diff) | |
| parent | 45a87c685b1378d3840df3e391134afb01dead6f (diff) | |
| download | mariadb-git-eebecee7d3559281e30c13027f77782aec131f29.tar.gz | |
automerge 5.1-security --> 5.5-security (bug 55424)
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 0ce67108423..d21b5353b76 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -104,7 +104,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() |