summaryrefslogtreecommitdiff
path: root/sql/sql_udf.cc
diff options
context:
space:
mode:
authorSergey Petrunia <sergefp@mysql.com>2008-07-15 18:13:21 +0400
committerSergey Petrunia <sergefp@mysql.com>2008-07-15 18:13:21 +0400
commit2951f00be4c2e332686ca713f77dab39615ea083 (patch)
treee53c78a5b0f2f37f7558020f80392ae283a65bf3 /sql/sql_udf.cc
parent52f510ef22d1ebb518467bdb0d29f3cb7a3e77b1 (diff)
downloadmariadb-git-2951f00be4c2e332686ca713f77dab39615ea083.tar.gz
BUG#35478: sort_union() returns bad data when sort_buffer_size is hit
- In QUICK_INDEX_MERGE_SELECT::read_keys_and_merge: when we got table->sort from Unique, tell init_read_record() not to use rr_from_cache() because a) rowids are already sorted and b) it might be that the the data is used by filesort(), which will need record rowids (which rr_from_cache() cannot provide). - Fully de-initialize the table->sort read in QUICK_INDEX_MERGE_SELECT::get_next(). This fixes BUG#35477. (bk trigger: file as fix for BUG#35478).
Diffstat (limited to 'sql/sql_udf.cc')
-rw-r--r--sql/sql_udf.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_udf.cc b/sql/sql_udf.cc
index 34ca18d5c39..849d152d93b 100644
--- a/sql/sql_udf.cc
+++ b/sql/sql_udf.cc
@@ -176,7 +176,7 @@ void udf_init()
}
table= tables.table;
- init_read_record(&read_record_info, new_thd, table, NULL,1,0);
+ init_read_record(&read_record_info, new_thd, table, NULL,1,0,FALSE);
while (!(error = read_record_info.read_record(&read_record_info)))
{
DBUG_PRINT("info",("init udf record"));