From caf85332ba6186dcfba3ad42d79959e0b0807740 Mon Sep 17 00:00:00 2001
From: "bar@mysql.com/bar.myoffice.izhnet.ru" <>
Date: Fri, 15 Jun 2007 11:19:35 +0500
Subject: [PATCH]   Bug#28862 Extended Latin1 characters get lost in CVS engine
   Problem: Temporary buffer which is used for quoting and escaping   was
 initialized to character set utf8, and thus didn't allow   to store data in
 other character sets.   Fix: changing character set of the buffer to be able
 to   store any arbitrary sequence of bytes.

---
 mysql-test/r/csv.result | 21 +++++++++++++++++++++
 mysql-test/t/csv.test   | 18 ++++++++++++++++++
 sql/examples/ha_tina.cc |  4 ++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/mysql-test/r/csv.result b/mysql-test/r/csv.result
index 8ec79e9d7a9..3900597d2a6 100644
--- a/mysql-test/r/csv.result
+++ b/mysql-test/r/csv.result
@@ -5009,3 +5009,24 @@ select * from bug15205;
 val
 drop table bug15205;
 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	À	LATIN CAPITAL LETTER A WITH GRAVE
+E0	à	LATIN SMALL LETTER A WITH GRAVE
+EE	î	LATIN SMALL LETTER I WITH CIRCUMFLEX
+F7	÷	DIVISION SIGN
+FE	þ	LATIN SMALL LETTER THORN
+FF	ÿ	LATIN SMALL LETTER Y WITH DIAERESIS
+drop table t1;
+End of 5.0 tests
diff --git a/mysql-test/t/csv.test b/mysql-test/t/csv.test
index 687f3ea3918..b724b4ce47c 100644
--- a/mysql-test/t/csv.test
+++ b/mysql-test/t/csv.test
@@ -1410,3 +1410,21 @@ select * from bug15205;
 drop table bug15205;
 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
diff --git a/sql/examples/ha_tina.cc b/sql/examples/ha_tina.cc
index 00f927aa7b7..2c5226222e2 100644
--- a/sql/examples/ha_tina.cc
+++ b/sql/examples/ha_tina.cc
@@ -301,7 +301,7 @@ ha_tina::ha_tina(TABLE *table_arg)
   chain_size(DEFAULT_CHAIN_LENGTH), records_is_known(0)
 {
   /* Set our original buffers from pre-allocated memory */
-  buffer.set(byte_buffer, IO_SIZE, system_charset_info);
+  buffer.set(byte_buffer, IO_SIZE, &my_charset_bin);
   chain= chain_buffer;
 }
 
@@ -447,7 +447,7 @@ int ha_tina::find_current_row(byte *buf)
       else
         buffer.append(*mapped_ptr);
     }
-    (*field)->store(buffer.ptr(), buffer.length(), system_charset_info);
+    (*field)->store(buffer.ptr(), buffer.length(), buffer.charset());
   }
   next_position= (end_ptr - share->mapped_file)+1;
   /* Maybe use \N for null? */