1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/usr/home/bar/mysql-4.1

Browse Source 
into  mysql.com:/usr/home/bar/mysql-5.0
This commit is contained in:
bar@mysql.com 2005-07-12 13:18:25 +05:00
commit 2204effda1
4 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/r/ctype_utf8.result
View File

@ -939,6 +939,17 @@ content msisdn
ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми 1234567890 ERR Имри.Афимим.Аеимимримдмримрмрирор имримримримр имридм ирбднримрфмририримрфмфмим.Ад.Д имдимримрад.Адимримримрмдиримримримр м.Дадимфшьмримд им.Адимимрн имадми 1234567890
11 g 1234567890 11 g 1234567890
DROP TABLE t1,t2; DROP TABLE t1,t2;
create table t1 (a char(20) character set utf8);
insert into t1 values ('123456'),('андрей');
alter table t1 modify a char(2) character set utf8;
Warnings:
Warning 1265 Data truncated for column 'a' at row 1
Warning 1265 Data truncated for column 'a' at row 2
select char_length(a), length(a), a from t1 order by a;
char_length(a) length(a) a
2 2 12
2 4 ан
drop table t1;
CREATE TABLE t1 ( CREATE TABLE t1 (
a varchar(255) NOT NULL default '', a varchar(255) NOT NULL default '',
KEY a (a) KEY a (a)

10
mysql-test/t/ctype_utf8.test
View File

@ -789,6 +789,16 @@ SELECT content, t2.msisdn FROM t1, t2 WHERE t1.msisdn = '1234567890';
DROP TABLE t1,t2; DROP TABLE t1,t2;
#
# Bug#11591: CHAR column with utf8 does not work properly
# (more chars than expected)
#
create table t1 (a char(20) character set utf8);
insert into t1 values ('123456'),('андрей');
alter table t1 modify a char(2) character set utf8;
select char_length(a), length(a), a from t1 order by a;
drop table t1;
# #
# Bug#9557 MyISAM utf8 table crash # Bug#9557 MyISAM utf8 table crash
# #

31
sql/field_conv.cc
View File

@ -324,21 +324,28 @@ static void do_field_real(Copy_field *copy)
static void do_cut_string(Copy_field *copy) static void do_cut_string(Copy_field *copy)
{ // Shorter string field { // Shorter string field
memcpy(copy->to_ptr,copy->from_ptr,copy->to_length); int well_formed_error;
CHARSET_INFO *cs= copy->from_field->charset();
const char *from_end= copy->from_ptr + copy->from_length;
uint copy_length= cs->cset->well_formed_len(cs, copy->from_ptr, from_end,
copy->to_length / cs->mbmaxlen,
&well_formed_error);
if (copy->to_length < copy_length)
copy_length= copy->to_length;
memcpy(copy->to_ptr, copy->from_ptr, copy_length);
/* Check if we loosed any important characters */ /* Check if we lost any important characters */
char *ptr,*end; if (well_formed_error ||
for (ptr=copy->from_ptr+copy->to_length,end=copy->from_ptr+copy->from_length ; cs->cset->scan(cs, copy->from_ptr + copy_length, from_end,
ptr != end ; MY_SEQ_SPACES) < (copy->from_length - copy_length))
ptr++)
{ {
if (!my_isspace(system_charset_info, *ptr)) // QQ: ucs incompatible copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
{ WARN_DATA_TRUNCATED, 1);
copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,
WARN_DATA_TRUNCATED, 1);
break;
}
} }
if (copy_length < copy->to_length)
cs->cset->fill(cs, copy->to_ptr + copy_length,
copy->to_length - copy_length, ' ');
} }

2
vio/viossl.c
View File

@ -316,7 +316,7 @@ int sslaccept(struct st_VioSSLAcceptorFd* ptr, Vio* vio, long timeout)
vio_blocking(vio, net_blocking, &unused); vio_blocking(vio, net_blocking, &unused);
DBUG_RETURN(1); DBUG_RETURN(1);
} }
#ifndef DBUF_OFF #ifndef DBUG_OFF
DBUG_PRINT("info",("SSL_get_cipher_name() = '%s'" DBUG_PRINT("info",("SSL_get_cipher_name() = '%s'"
,SSL_get_cipher_name((SSL*) vio->ssl_arg))); ,SSL_get_cipher_name((SSL*) vio->ssl_arg)));
client_cert = SSL_get_peer_certificate ((SSL*) vio->ssl_arg); client_cert = SSL_get_peer_certificate ((SSL*) vio->ssl_arg);