mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-23 12:43:03 +01:00
Correct my previous commit
This commit is contained in:
parent
b1b3832d91
commit
471deca6fe
@ -19,7 +19,7 @@
|
|||||||
*
|
*
|
||||||
* All Rights Reserved.
|
* All Rights Reserved.
|
||||||
* Contributor(s): ______________________________________.
|
* Contributor(s): ______________________________________.
|
||||||
* $Id: sort.cpp,v 1.71 2004-11-01 08:23:40 robocop Exp $
|
* $Id: sort.cpp,v 1.72 2004-11-02 15:42:18 hvlad Exp $
|
||||||
*
|
*
|
||||||
* 2001-09-24 SJL - Temporary fix for large sort file bug
|
* 2001-09-24 SJL - Temporary fix for large sort file bug
|
||||||
*
|
*
|
||||||
@ -2120,9 +2120,11 @@ static sort_record* get_merge(merge_control* merge, sort_context* scb
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
l = scb->scb_key_length - scb->scb_unique_length;
|
if (l == 0) {
|
||||||
if (l != 0)
|
l = scb->scb_key_length - scb->scb_unique_length;
|
||||||
DO_32_COMPARE(p, q, l);
|
if (l != 0)
|
||||||
|
DO_32_COMPARE(p, q, l);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef SCROLLABLE_CURSORS
|
#ifdef SCROLLABLE_CURSORS
|
||||||
if (mode == RSE_get_forward && p[-1] < q[-1])
|
if (mode == RSE_get_forward && p[-1] < q[-1])
|
||||||
|
Loading…
Reference in New Issue
Block a user