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

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

1 files changed, 2 insertions, 2 deletions

diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 9eead7a059c..6de153c82d7 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -444,7 +444,7 @@ ha_tina::ha_tina(handlerton *hton, TABLE_SHARE *table_arg)
   records_is_known(0)
 {
   /* 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;
   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))
-      (*field)->store(buffer.ptr(), buffer.length(), system_charset_info);
+      (*field)->store(buffer.ptr(), buffer.length(), buffer.charset());
   }
   next_position= end_offset + eoln_len;
   error= 0;