summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2002-11-27 19:16:06 +0200
committerunknown <bell@sanja.is.com.ua>2002-11-27 19:16:06 +0200
commite3114057d4f397e0f8c3c8f98a8caf7ce06d8197 (patch)
treef8ec3d1743633a851c9fabf7cf17ac12620c12a6 /sql/filesort.cc
parentbcaa09771f9bd37ffbb4b00b9b598add14215ca7 (diff)
downloadmariadb-git-e3114057d4f397e0f8c3c8f98a8caf7ce06d8197.tar.gz
layout fix
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 8247b52ad1b..e2a108bfccc 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -84,7 +84,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
#endif
// BAR TODO: this is not absolutely correct, but OK for now
- for(i=0;i<table->fields;i++)
+ for (i=0;i<table->fields;i++)
if (!table->field[i]->binary())
charset=table->field[i]->charset();
// /BAR TODO
@@ -973,6 +973,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
case ROW_RESULT:
// This case should never be choosen
DBUG_ASSERT(0);
+ break;
}
if (sortorder->item->maybe_null)
length++; // Place for NULL marker