diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-25 17:33:51 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-25 17:33:51 +0200 |
| commit | 1b9becc35824401f22b4e7c2b2f9b3dab5348fe9 (patch) | |
| tree | 5b47ce28ff625bae821d7bbc89fc86a74bc810a1 /sql/sql_string.h | |
| parent | 0985653c1f820badb4ab642fe8e9f1287fd20656 (diff) | |
| download | mariadb-git-1b9becc35824401f22b4e7c2b2f9b3dab5348fe9.tar.gz | |
Fixed CAST( xxx as CHAR)
sql/item.h:
Made some virtual functions non virtual (as they are not used virtually)
sql/item_strfunc.cc:
Optimizations.
sql/item_strfunc.h:
Fixed BINARY handling
sql/sql_string.h:
Indentation cleanups
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 42f9e446981..dde67b11d50 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -72,7 +72,7 @@ public: { sql_element_free(ptr_arg); } ~String() { free(); } - inline void set_charset(CHARSET_INFO *charset) { str_charset=charset; } + inline void set_charset(CHARSET_INFO *charset) { str_charset= charset; } inline CHARSET_INFO *charset() const { return str_charset; } inline uint32 length() const { return str_length;} inline uint32 alloced_length() const { return Alloced_length;} @@ -177,7 +177,8 @@ public: bool copy(); // Alloc string if not alloced bool copy(const String &s); // Allocate new string bool copy(const char *s,uint32 arg_length, CHARSET_INFO *cs); // Allocate new string - bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom, CHARSET_INFO *csto); + bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom, + CHARSET_INFO *csto); bool append(const String &s); bool append(const char *s,uint32 arg_length=0); bool append(IO_CACHE* file, uint32 arg_length); |