Percona Server moved to https://jira.percona.com/projects/PS

Merge lp:~laurynas-biveinis/percona-server/bug1388001 into lp:percona-server/5.6

  1. bug1388001
  2. Merge into 5.6
Proposed by Laurynas Biveinis
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: no longer in the source branch.
Merged at revision: 692
Proposed branch: lp:~laurynas-biveinis/percona-server/bug1388001
Merge into: lp:percona-server/5.6
Diff against target: 14 lines (+3/-0)
1 file modified
sql/sql_executor.cc (+3/-0)
To merge this branch: bzr merge lp:~laurynas-biveinis/percona-server/bug1388001
Reviewer Review Type Date Requested Status
Laurynas Biveinis (community) Approve
Review via email: mp+240268@code.launchpad.net

Description of the change

Fix bug 1388001 / https://tokutek.atlassian.net/browse/DB-650
(Incorrect error handling for prepare_index_scan failure in
join_read_first) by applying the patch at
https://github.com/Tokutek/percona-server-5.6/commit/5f3f1e29692304a73dc91de70e366dc876d84c20
which calls report_handler_error in join_read_first in the case of
prepare_index_scan failure.

http://jenkins.percona.com/job/percona-server-5.6-param/748/

To post a comment you must log in.
Revision history for this message
Laurynas Biveinis (laurynas-biveinis) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'sql/sql_executor.cc'
2--- sql/sql_executor.cc 2014-08-22 10:02:24 +0000
3+++ sql/sql_executor.cc 2014-10-31 13:59:11 +0000
4@@ -2533,7 +2533,10 @@
5 return 1;
6 }
7 if ((error= tab->table->file->prepare_index_scan()))
8+ {
9+ report_handler_error(table, error);
10 return 1;
11+ }
12 if ((error= tab->table->file->ha_index_first(tab->table->record[0])))
13 {
14 if (error != HA_ERR_KEY_NOT_FOUND && error != HA_ERR_END_OF_FILE)

Subscribers

People subscribed via source and target branches