Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@stripped, 2006-12-04 18:47:16+03:00, petr@stripped +1 -0
Merge pchardin@stripped:/home/bk/mysql-5.1-runtime
into outpost.site:/home/cps/mysql/trees/5.1-runtime-19044
MERGE: 1.2353.19.14
storage/csv/ha_tina.cc@stripped, 2006-12-04 18:47:11+03:00, petr@stripped +0 -0
Auto merged
MERGE: 1.69.2.1
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: petr
# Host: outpost.site
# Root: /home/cps/mysql/trees/5.1-runtime-19044/RESYNC
--- 1.71/storage/csv/ha_tina.cc 2006-12-01 00:25:31 +03:00
+++ 1.72/storage/csv/ha_tina.cc 2006-12-04 18:47:11 +03:00
@@ -517,14 +517,16 @@
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;
}
else
| Thread |
|---|
| • bk commit into 5.1 tree (petr:1.2371) | Petr Chardin | 4 Dec |