diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
| commit | ffc8f62b08982cc1f2fabf8b4b38bd124c115a97 (patch) | |
| tree | da42637b1ae9402a7436b715f9c0db57cdddc87a /sql/protocol.cc | |
| parent | 6b157f6be3cb056a93eb925df3880098c871b32a (diff) | |
| parent | 0fc39acb8125fae95062e7b680b022b075a308c3 (diff) | |
| download | mariadb-git-ffc8f62b08982cc1f2fabf8b4b38bd124c115a97.tar.gz | |
merge 5.1->5.2
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 f9bdec1b2ac..7721d43f936 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2003 MySQL AB +/* Copyright (c) 2000, 2010 Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -894,7 +894,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, (int) length, from)); + 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 || |