diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-11-05 10:59:51 +0100 |
| commit | bc2e383e4a0dbc1949d5b65102e843c01237e23c (patch) | |
| tree | 23bb774ead6f6cc840c11c0536f3f59c5d417aca /sql/sql_string.h | |
| parent | 4cce72a9292c98fab5628adc24c1635e315444e7 (diff) | |
| parent | 4cfa91f42c4cde9c35979cd2b9837cb60213d876 (diff) | |
| download | mariadb-git-bc2e383e4a0dbc1949d5b65102e843c01237e23c.tar.gz | |
mysql-5.1 -> mysql-5.5 merge
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() |