database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge mysql.com:/usr/home/bar/mysql-5.0.b18908

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.1-rpl
This commit is contained in:
bar@bar.intranet.mysql.r18.ru
2006-11-01 16:48:03 +04:00
parent c9b963cfcd 0e3a1eece7
commit cefa1cf9e0
13 changed files with 402 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_string.h
View File

@ -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
{