Drizzle

Merge lp://qastaging/~stewart/drizzle/bug676770-enum-sort-aborted into lp://qastaging/drizzle/7.0

  1. bug676770-enum-sort-aborted
  2. Merge into 7.0
Proposed by Stewart Smith
Status: Superseded
Proposed branch: lp://qastaging/~stewart/drizzle/bug676770-enum-sort-aborted
Merge into: lp://qastaging/drizzle/7.0
Diff against target: 156 lines (+136/-0)
3 files modified
drizzled/optimizer/range.cc (+6/-0)
tests/suite/regression/r/676770.result (+62/-0)
tests/suite/regression/t/676770.test (+68/-0)
To merge this branch: bzr merge lp://qastaging/~stewart/drizzle/bug676770-enum-sort-aborted
Reviewer Review Type Date Requested Status
Brian Aker Needs Fixing
Lee Bieber (community) Needs Fixing
Review via email: mp+49196@code.qastaging.launchpad.net

This proposal has been superseded by a proposal from 2011-02-23.

Description of the change

fixes the odd "sort aborted" error message. audited all code paths that produce the return code and it should all be okay (ultimately it's ::store).

To post a comment you must log in.
Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

Failing test on most machines, see http://jenkins.drizzle.org/view/Drizzle-build/job/drizzle-build-fedora14/1287/console

review: Needs Fixing
lp://qastaging/~stewart/drizzle/bug676770-enum-sort-aborted updated
2085. By Stewart Smith

fix regression.676770 test so that it does really look for ONLY what we're looking for.

Revision history for this message
Stewart Smith (stewart) wrote :

should be fixed now: http://jenkins.drizzle.org/view/Drizzle-param/job/drizzle-param/740/

Revision history for this message
Lee Bieber (kalebral-deactivatedaccount) wrote :

repeat-tests-twice fails

http://jenkins.drizzle.org/job/drizzle-build-repeat-tests-twice/220/console

regression.676770 [ pass ] 142
regression.676770 [ fail ]
--- .././tests/suite/regression/r/676770.result 2011-02-14 06:54:54.000000000 +0300
+++ .././tests/suite/regression/r/676770.reject 2011-02-14 07:48:22.000000000 +0300
@@ -56,6 +56,7 @@
 SELECT LOAD_FILE('DTR_VARDIR/tmp/enum_errlog.tmp');
 LOAD_FILE('DTR_VARDIR/tmp/enum_errlog.tmp')
 CURRENT_TEST: regression.676770
+CURRENT_TEST: regression.676770

review: Needs Fixing
Revision history for this message
Stewart Smith (stewart) wrote :

this should fix that - doesn't preserve the CURRENT_TEST line.

lp://qastaging/~stewart/drizzle/bug676770-enum-sort-aborted updated
2086. By Stewart Smith

don't save the CURRENT_TEST line from the errlog to the enum_errlog file in bug 676770 regression test as running the test twice in a row means we get two of the CURRENT_TEST lines

Revision history for this message
Brian Aker (brianaker) wrote :

http://hudson.drizzle.org/view/Drizzle-build/job/drizzle-build-fedora14/1303/console

review: Needs Fixing
lp://qastaging/~stewart/drizzle/bug676770-enum-sort-aborted updated
2087. By Stewart Smith

Merge trunk

2088. By Stewart Smith

if empty file, we get NULL - which we should get

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches