diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-06-29 16:54:55 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2012-06-29 16:54:55 +0300 |
| commit | 26f0c1fd4b3c502f9defb8e4e91b567cdf7b0957 (patch) | |
| tree | e47e30d41c92efb2ee66c520957eae4bdf7b8513 /sql | |
| parent | 050048462c8209a5e5d75587147d343f683cc7df (diff) | |
| parent | 428ff7f8a0b1abfbe34b617411da42ef4159ea7c (diff) | |
| download | mariadb-git-26f0c1fd4b3c502f9defb8e4e91b567cdf7b0957.tar.gz | |
merge bug#13708485 5.1->5.5
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/protocol.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index 53ab032517e..5c1533ad10d 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2012, 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 @@ -722,6 +722,8 @@ bool Protocol::send_result_set_metadata(List<Item> *list, uint flags) /* Store fixed length fields */ pos= (char*) local_packet->ptr()+local_packet->length(); *pos++= 12; // Length of packed fields + /* inject a NULL to test the client */ + DBUG_EXECUTE_IF("poison_rs_fields", pos[-1]= 0xfb;); if (item->charset_for_protocol() == &my_charset_bin || thd_charset == NULL) { /* No conversion */ |