diff options
| author | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-15 16:29:07 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alexander.nozdrin@oracle.com> | 2011-07-15 16:29:07 +0400 |
| commit | 2d76226f062659e83ed570ee1c8e3c21517969a6 (patch) | |
| tree | 36b650126bae00ecfd799e6983021764feed4179 /sql/protocol.cc | |
| parent | f333700a71bb3f457ef2509f9078f0afdab5cc46 (diff) | |
| parent | 56931dd0155756562ec4288e1732d99b996593dc (diff) | |
| download | mariadb-git-2d76226f062659e83ed570ee1c8e3c21517969a6.tar.gz | |
Auto-merge from mysql-5.1.
Diffstat (limited to 'sql/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index b563925f612..53ab032517e 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -980,8 +980,8 @@ 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, (length == 0? "" : from))); + DBUG_PRINT("info", ("Protocol_text::store field %u (%u): %.*s", field_pos, + field_count, (int) length, (length == 0 ? "" : from))); DBUG_ASSERT(field_pos < field_count); DBUG_ASSERT(field_types == 0 || field_types[field_pos] == MYSQL_TYPE_DECIMAL || |