diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-01 16:48:03 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-01 16:48:03 +0400 |
| commit | bfdc9c120792c412e7cbb03b071616aaf899599a (patch) | |
| tree | 05bd541c3b5ac58466925f5a05817fec19097049 /sql/sql_string.h | |
| parent | a78bdf82250f771f35aa35210da2b7729bbe9b05 (diff) | |
| parent | 00c1c19e9410a942ed7b2b49e7dc7916a9d8010f (diff) | |
| download | mariadb-git-bfdc9c120792c412e7cbb03b071616aaf899599a.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b18908
into mysql.com:/usr/home/bar/mysql-5.1-rpl
BitKeeper/etc/collapsed:
auto-union
mysql-test/r/ctype_recoding.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/r/strict_autoinc_1myisam.result:
Auto merged
mysql-test/r/strict_autoinc_2innodb.result:
Auto merged
mysql-test/r/strict_autoinc_3heap.result:
Auto merged
mysql-test/r/strict_autoinc_4bdb.result:
Auto merged
mysql-test/r/strict_autoinc_5ndb.result:
Auto merged
sql/sql_string.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/field.cc:
SCCS merged
Diffstat (limited to 'sql/sql_string.h')
| -rw-r--r-- | sql/sql_string.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/sql_string.h b/sql/sql_string.h index b1d417be2c2..a72b24ae9d0 100644 --- a/sql/sql_string.h +++ b/sql/sql_string.h @@ -30,6 +30,14 @@ String *copy_if_not_alloced(String *a,String *b,uint32 arg_length); uint32 copy_and_convert(char *to, uint32 to_length, CHARSET_INFO *to_cs, const char *from, uint32 from_length, CHARSET_INFO *from_cs, uint *errors); +uint32 well_formed_copy_nchars(CHARSET_INFO *to_cs, + char *to, uint to_length, + CHARSET_INFO *from_cs, + const char *from, uint from_length, + uint nchars, + const char **well_formed_error_pos, + const char **cannot_convert_error_pos, + const char **from_end_pos); class String { |