diff options
| author | MySQL Build Team <build@mysql.com> | 2010-03-24 13:11:57 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2010-03-24 13:11:57 +0100 |
| commit | 678d12fd8bf3849f3ff85b93a9ad8619352f8cd8 (patch) | |
| tree | cccaeb59b8db59eeced02010e594ac76f8fd46c5 | |
| parent | 80bf070d8f5dee02e9467bb5ea0380888a3d9209 (diff) | |
| download | mariadb-git-678d12fd8bf3849f3ff85b93a9ad8619352f8cd8.tar.gz | |
Backport into build-201003230706-5.1.43sp1
> ------------------------------------------------------------
> revno: 3333.1.11 [merge]
> revision-id: joro@sun.com-20100201115030-hgvq6489bt0w3rty
> parent: li-bing.song@sun.com-20100130124925-o6sfex42b6noyc6x
> parent: joro@sun.com-20100201114016-jylx4hivgqbs0vg2
> committer: Georgi Kodinov <joro@sun.com>
> branch nick: test-5.1-bugteam
> timestamp: Mon 2010-02-01 13:50:30 +0200
> message:
> merge
> ------------------------------------------------------------
> Use --include-merges or -n0 to see merged revisions.
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c1c3827106a..0e36d35289f 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -549,7 +549,7 @@ JOIN::prepare(Item ***rref_pointer_array, there. Such fields don't contain any data to sort. */ if (!real_order && - (item->type() != Item::Item::FIELD_ITEM || + (item->type() != Item::FIELD_ITEM || ((Item_field *) item)->field->maybe_null() || ((Item_field *) item)->field->sort_length())) real_order= TRUE; |