diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-10-25 15:21:16 +0200 |
| commit | 95369d62bc8859a9ba5c35887460678e2a160f6e (patch) | |
| tree | 587654c186615669df8d81b851db711bb8ac2f62 /sql/sql_string.h | |
| parent | d2e8c9185732ab7e8e8c2ba27634aaa5785f43ce (diff) | |
| parent | 638033b9d549e81e2874682c59a720aa859ad5b8 (diff) | |
| download | mariadb-git-95369d62bc8859a9ba5c35887460678e2a160f6e.tar.gz | |
merge with 5.1
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 f5794cca6b2..e595de47f99 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -108,7 +108,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() |