database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862

Browse Source 
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862


mysql-test/r/csv.result:
  After merge fix
mysql-test/t/csv.test:
  After merge fix
storage/csv/ha_tina.cc:
  After merge fix
This commit is contained in:
unknown
2007-06-15 11:27:10 +05:00
parent f97b8c9978 39700afdb9
commit 1805b34e04
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mysql-test/r/csv.result
View File

@ -5203,6 +5203,27 @@ select * from bug15205;
val val
drop table bug15205; drop table bug15205;
drop table bug15205_2; drop table bug15205_2;
set names latin1;
create table t1 (
c varchar(1),
name varchar(64)
) character set latin1 engine=csv;
insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE');
insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE');
insert into t1 values (0xEE,'LATIN SMALL LETTER I WITH CIRCUMFLEX');
insert into t1 values (0xFE,'LATIN SMALL LETTER THORN');
insert into t1 values (0xF7,'DIVISION SIGN');
insert into t1 values (0xFF,'LATIN SMALL LETTER Y WITH DIAERESIS');
select hex(c), c, name from t1 order by 1;
hex(c) c name
C0 <09> LATIN CAPITAL LETTER A WITH GRAVE
E0 <09> LATIN SMALL LETTER A WITH GRAVE
EE <09> LATIN SMALL LETTER I WITH CIRCUMFLEX
F7 <09> DIVISION SIGN
FE <09> LATIN SMALL LETTER THORN
FF <09> LATIN SMALL LETTER Y WITH DIAERESIS
drop table t1;
End of 5.0 tests
create table bug22080_1 (id int,string varchar(64)) Engine=CSV; create table bug22080_1 (id int,string varchar(64)) Engine=CSV;
create table bug22080_2 (id int,string varchar(64)) Engine=CSV; create table bug22080_2 (id int,string varchar(64)) Engine=CSV;
create table bug22080_3 (id int,string varchar(64)) Engine=CSV; create table bug22080_3 (id int,string varchar(64)) Engine=CSV;

21
mysql-test/t/csv.test
View File

@ -1596,6 +1596,27 @@ select * from bug15205;
drop table bug15205; drop table bug15205;
drop table bug15205_2; drop table bug15205_2;
#
# Bug#28862 "Extended Latin1 characters get lost in CVS engine"
#
set names latin1;
create table t1 (
c varchar(1),
name varchar(64)
) character set latin1 engine=csv;
insert into t1 values (0xC0,'LATIN CAPITAL LETTER A WITH GRAVE');
insert into t1 values (0xE0,'LATIN SMALL LETTER A WITH GRAVE');
insert into t1 values (0xEE,'LATIN SMALL LETTER I WITH CIRCUMFLEX');
insert into t1 values (0xFE,'LATIN SMALL LETTER THORN');
insert into t1 values (0xF7,'DIVISION SIGN');
insert into t1 values (0xFF,'LATIN SMALL LETTER Y WITH DIAERESIS');
select hex(c), c, name from t1 order by 1;
drop table t1;
--echo End of 5.0 tests
# #
# Bug#22080 "CHECK fails to identify some corruption" # Bug#22080 "CHECK fails to identify some corruption"
# #

4
storage/csv/ha_tina.cc
View File

@ -444,7 +444,7 @@ ha_tina::ha_tina(handlerton *hton, TABLE_SHARE *table_arg)
records_is_known(0) records_is_known(0)
{ {
/* Set our original buffers from pre-allocated memory */ /* Set our original buffers from pre-allocated memory */
buffer.set((char*)byte_buffer, IO_SIZE, system_charset_info); buffer.set((char*)byte_buffer, IO_SIZE, &my_charset_bin);
chain= chain_buffer; chain= chain_buffer;
file_buff= new Transparent_file(); file_buff= new Transparent_file();
} }
@ -679,7 +679,7 @@ int ha_tina::find_current_row(uchar *buf)
} }
if (bitmap_is_set(table->read_set, (*field)->field_index)) if (bitmap_is_set(table->read_set, (*field)->field_index))
(*field)->store(buffer.ptr(), buffer.length(), system_charset_info); (*field)->store(buffer.ptr(), buffer.length(), buffer.charset());
} }
next_position= end_offset + eoln_len; next_position= end_offset + eoln_len;
error= 0; error= 0;