summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2002-11-27 19:16:06 +0200
committerbell@sanja.is.com.ua <>2002-11-27 19:16:06 +0200
commit5f2016bb20b3d5036f87d7fb3178894be81f430a (patch)
treef8ec3d1743633a851c9fabf7cf17ac12620c12a6 /sql/filesort.cc
parentbfcd4a719712655f5f5f820bc2e08bd7b2dbd4f1 (diff)
downloadmariadb-git-5f2016bb20b3d5036f87d7fb3178894be81f430a.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