1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00

Merge mysql-5.0-bugteam -> mysql-5.1-bugteam.

This commit is contained in:
Alexey Kopytov
2009-02-05 15:49:59 +03:00
5 changed files with 40 additions and 20 deletions

View File

@@ -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())