Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Kirill Smelkov
mariadb
Commits
a0371874
Commit
a0371874
authored
15 years ago
by
Alexander Nozdrin
Browse files
Options
Download
Email Patches
Plain Diff
Fix Windows build failure (after manual merge from 5.1-bugteam).
parent
4b70e544
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
sql/sql_select.cc
sql/sql_select.cc
+1
-1
No files found.
sql/sql_select.cc
View file @
a0371874
...
...
@@ -553,7 +553,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;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment