diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-11-25 03:50:16 +0000 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-11-25 03:50:16 +0000 |
| commit | 94cb45b3e6601967eb4fe8ed0cfec8a7209bb9ae (patch) | |
| tree | c4dd23f6b4dc06870068ee555a2510dfca2b43a1 /strings | |
| parent | ee2b93944b2f7267690f29639da7e881f39379fa (diff) | |
| parent | 3a15cb6ce92fe9e7172f51991317cfbeb5307966 (diff) | |
| download | mariadb-git-94cb45b3e6601967eb4fe8ed0cfec8a7209bb9ae.tar.gz | |
merge some docs changes and a test case; null merge the code.
(we don't need to port the actual code from 5.1;
5.5+ do the relevant things differently, but correctly. the
test obviously is so it stays that way.)
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/CHARSET_INFO.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/strings/CHARSET_INFO.txt b/strings/CHARSET_INFO.txt index bb8e40025c7..6f0a810be37 100644 --- a/strings/CHARSET_INFO.txt +++ b/strings/CHARSET_INFO.txt @@ -208,14 +208,11 @@ charpos() - calculates the offset of the given position in the string. Used in SQL functions LEFT(), RIGHT(), SUBSTRING(), INSERT() -well_formed_length() - - finds the length of correctly formed multi-byte beginning. - Used in INSERTs to cut a beginning of the given string - which is - a) "well formed" according to the given character set. +well_formed_len() + - returns length of a given multi-byte string in bytes + Used in INSERTs to shorten the given string so it + a) is "well formed" according to the given character set b) can fit into the given data type - Terminates the string in the good position, taking in account - multi-byte character boundaries. lengthsp() - returns the length of the given string without trailing spaces. |