diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2010-03-25 14:49:24 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2010-03-25 14:49:24 +0200 |
| commit | dc62faf44030864e311acf3ce00f34c0d4af40a9 (patch) | |
| tree | 81c969f352cfbf8b79e92d15c143773da8232f84 /sql | |
| parent | f3b8b07a432e2aa449a5b8dc306f8de6bc62fcef (diff) | |
| parent | 649ec7758ff0da5355f04d717d57e50fe452e3c0 (diff) | |
| download | mariadb-git-dc62faf44030864e311acf3ce00f34c0d4af40a9.tar.gz | |
merging bug#52304 to 5.1-bt,pe
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/protocol.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index fad84f8be40..dc53e029647 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -850,7 +850,7 @@ bool Protocol_text::store(const char *from, size_t length, CHARSET_INFO *tocs= this->thd->variables.character_set_results; #ifndef DBUG_OFF DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %s", field_pos, - field_count, from)); + field_count, (length == 0? "" : from))); DBUG_ASSERT(field_pos < field_count); DBUG_ASSERT(field_types == 0 || field_types[field_pos] == MYSQL_TYPE_DECIMAL || |