diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-13 19:20:56 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-13 19:20:56 +0300 |
| commit | dd35a152f91cdb5790619fc3cbc0cfbc09666f5f (patch) | |
| tree | e907d3bf6c88897a516896d7cc9dac08985f5907 /sql/sql_class.cc | |
| parent | bdbe393db1b55cbde9aa4ca66cc551b57dad7f1f (diff) | |
| parent | 9373b1b88031a9bf4ef7fb1a42680c9f98f837f4 (diff) | |
| download | mariadb-git-dd35a152f91cdb5790619fc3cbc0cfbc09666f5f.tar.gz | |
Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 118dc5af68f..597478933d6 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1587,6 +1587,11 @@ bool select_send::send_data(List<Item> &items) my_message(ER_OUT_OF_RESOURCES, ER(ER_OUT_OF_RESOURCES), MYF(0)); break; } + /* + Reset buffer to its original state, as it may have been altered in + Item::send(). + */ + buffer.set(buff, sizeof(buff), &my_charset_bin); } thd->sent_row_count++; if (thd->is_error()) |