database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
into  mysql.com:/home/bar/mysql-5.1.b25815
This commit is contained in:
bar@mysql.com
2007-01-31 17:01:28 +04:00
parent b3ade670a6 ffeaffc26f
commit b81d6b8f66
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/extra/binlog_tests/ctype_cp932.test
View File

@@ -413,3 +413,14 @@ select * from t1;
insert into t1 values ('abc'); insert into t1 values ('abc');
select * from t1; select * from t1;
drop table 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;

12
mysql-test/r/binlog_stm_ctype_cp932.result
View File

@@ -11353,3 +11353,15 @@ a
a a
a a
drop table t1; 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;

2
sql/field.cc
View File

@@ -7213,7 +7213,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs)
cannot_convert_error_pos, from + length)) cannot_convert_error_pos, from + length))
return 2; return 2;
if (copy_length < length) if (from_end_pos < from + length)
{ {
report_data_too_long(this); report_data_too_long(this);
return 2; return 2;

2
sql/mysqld.cc
View File

@@ -7486,7 +7486,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case (int) OPT_STANDALONE: /* Dummy option for NT */ case (int) OPT_STANDALONE: /* Dummy option for NT */
break; break;
#endif #endif
/* /*
The following change issues a deprecation warning if the slave The following change issues a deprecation warning if the slave
configuration is specified either in the my.cnf file or on configuration is specified either in the my.cnf file or on
the command-line. See BUG#21490. the command-line. See BUG#21490.