Commit 82d66603 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bar/mysql-5.0.b25815 

into  mysql.com:/home/bar/mysql-5.1.b25815


sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
sql/mysqld.cc:
  After merge fix
parents 2d9e8747 fb33da5f

mysql-test/extra/binlog_tests/ctype_cp932.test

+11 −0
Original line number Diff line number Diff line
@@ -413,3 +413,14 @@ select * from t1; 
insert into t1 values ('abc');

select * from t1;

drop table t1;



#

# Bug#25815 Data truncated for column TEXT

#

set names utf8;

create table t1 (a text) default character set cp932;

insert into t1 values (_utf8 0xE38182);

show warnings;

select * from t1;

select hex(a) from t1;

drop table t1;

mysql-test/r/binlog_stm_ctype_cp932.result

+12 −0
Original line number Diff line number Diff line
@@ -11353,3 +11353,15 @@ a 
a

a

drop table t1;

set names utf8;

create table t1 (a text) default character set cp932;

insert into t1 values (_utf8 0xE38182);

show warnings;

Level	Code	Message

select * from t1;

a

あ

select hex(a) from t1;

hex(a)

82A0

drop table t1;

sql/field.cc

+1 −1
Original line number Diff line number Diff line
@@ -7213,7 +7213,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs) 
                              cannot_convert_error_pos, from + length))

    return 2;



  if (copy_length < length)

  if (from_end_pos < from + length)

  {

    report_data_too_long(this);

    return 2;

sql/mysqld.cc

+1 −1

File changed.

Contains only whitespace changes.