diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-05-31 10:43:34 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-05-31 10:43:34 +0200 |
| commit | 0fc39acb8125fae95062e7b680b022b075a308c3 (patch) | |
| tree | cf991484ab999e60eb9b33d81733fca16b368cf9 /sql/protocol.cc | |
| parent | e6eab96555d8cf70cbe6c8a94956855a0b5eca43 (diff) | |
| parent | 80ba8556e772fd7e4eb369c64bb32ca44f93e221 (diff) | |
| download | mariadb-git-0fc39acb8125fae95062e7b680b022b075a308c3.tar.gz | |
Automerge MariaDB 5.1.47 release into main.
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 11b4c085505..41ebbcfba90 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 @@ -912,7 +912,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 || |