diff options
| author | monty@mysql.com <> | 2004-02-09 12:31:03 +0100 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-02-09 12:31:03 +0100 |
| commit | 06432eac3606d75045109e3bad2538543f1a574b (patch) | |
| tree | 4cdb6965fba280ace2fc30421a0f25332597e43e /sql/sql_string.h | |
| parent | 480b082cf44db4fb2722e256f16e5f8c7c537bcf (diff) | |
| download | mariadb-git-06432eac3606d75045109e3bad2538543f1a574b.tar.gz | |
Added --compact to mysqlbinlog
Fixed output from mysqlbinlog when using --skip-comments
Fixed warnings from valgrind
Fixed ref_length when used with HEAP tables
More efficent need_conversion()
Fixed error handling in UPDATE with not updateable tables
Fixed bug in null handling in CAST to signed/unsigned
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index 9c0900137e3..163156fdfe2 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -183,9 +183,11 @@ 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 - static bool needs_conversion(const char *s, uint32 arg_length, - CHARSET_INFO *cs_from, CHARSET_INFO *cs_to); - bool copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs); + static bool needs_conversion(uint32 arg_length, + CHARSET_INFO *cs_from, CHARSET_INFO *cs_to, + uint32 *offset); + bool copy_aligned(const char *s, uint32 arg_length, uint32 offset, + CHARSET_INFO *cs); bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs); bool copy(const char*s,uint32 arg_length, CHARSET_INFO *csfrom, CHARSET_INFO *csto); |