merging bug#52304 to 5.1-bt,pe

dc62faf4 · Andrei Elkin · f3b8b07a · 649ec775 · dc62faf4
Commit dc62faf4 authored Mar 25, 2010 by Andrei Elkin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/protocol.cc sql/protocol.cc +1 -1

No files found.
--- 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 ||