Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  bodhi.local:/opt/local/work/mysql-5.1-runtime


mysql-test/t/trigger.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
storage/csv/ha_tina.cc:
  Auto merged
mysql-test/r/csv.result:
  Manual merge.
mysql-test/t/csv.test:
  Manual merge.

1 files changed, 4 insertions, 2 deletions

diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 0818b915618..afe8e5f1b27 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -469,14 +469,16 @@ int ha_tina::encode_quote(byte *buf)
     const char *end_ptr;
 
     /*
-      Write an empty string to the buffer in case of a NULL value.
+      CSV does not support nulls. Write quoted 0 to the buffer. In fact,
+      (*field)->val_str(&attribute,&attribute) would usually return 0
+      in this case but we write it explicitly here.
       Basically this is a safety check, as no one ensures that the
       field content is cleaned up every time we use Field::set_null()
       in the code.
     */
     if ((*field)->is_null())
     {
-      buffer.append(STRING_WITH_LEN("\"\","));
+      buffer.append(STRING_WITH_LEN("\"0\","));
       continue;
     }