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

Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt

Browse Source 
into  olga.mysql.com:/home/igor/mysql-5.0-opt


sql/item_cmpfunc.cc:
  Auto merged
This commit is contained in:
unknown
2007-01-09 12:07:13 -08:00
parent eca431f3f3 78dff026af
commit 15bb22c0a8
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/r/type_binary.result
View File

@ -136,4 +136,13 @@ insert into t1 values(NULL, 0x412020);
ERROR 22001: Data too long for column 'vb' at row 1 ERROR 22001: Data too long for column 'vb' at row 1
drop table t1; drop table t1;
set @@sql_mode= @old_sql_mode; set @@sql_mode= @old_sql_mode;
create table t1(f1 int, f2 binary(2) not null, f3 char(2) not null);
insert into t1 set f1=1;
Warnings:
Warning 1364 Field 'f2' doesn't have a default value
Warning 1364 Field 'f3' doesn't have a default value
select hex(f2), hex(f3) from t1;
hex(f2) hex(f3)
0000
drop table t1;
End of 5.0 tests End of 5.0 tests

8
mysql-test/t/type_binary.test
View File

@ -91,4 +91,12 @@ insert into t1 values(NULL, 0x412020);
drop table t1; drop table t1;
set @@sql_mode= @old_sql_mode; set @@sql_mode= @old_sql_mode;
#
# Bug#14171: Wrong default value for a BINARY field
#
create table t1(f1 int, f2 binary(2) not null, f3 char(2) not null);
insert into t1 set f1=1;
select hex(f2), hex(f3) from t1;
drop table t1;
--echo End of 5.0 tests --echo End of 5.0 tests

3
sql/field.h
View File

@ -1034,7 +1034,8 @@ public:
bool zero_pack() const { return 0; } bool zero_pack() const { return 0; }
int reset(void) int reset(void)
{ {
charset()->cset->fill(charset(),ptr,field_length,' '); charset()->cset->fill(charset(),ptr,field_length,
(has_charset() ? ' ' : 0));
return 0; return 0;
} }
int store(const char *to,uint length,CHARSET_INFO *charset); int store(const char *to,uint length,CHARSET_INFO *charset);