diff options
| author | bell@sanja.is.com.ua <> | 2002-11-27 19:31:11 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2002-11-27 19:31:11 +0200 |
| commit | 4be2cfd62d077590420e7b4d1ab006ae014738cc (patch) | |
| tree | d1b07dc0628b773032c9602776d3da5f234266e5 /sql/filesort.cc | |
| parent | a3ae370db8df2a10b5414d3c7dd54b69f1029d4b (diff) | |
| parent | 5f2016bb20b3d5036f87d7fb3178894be81f430a (diff) | |
| download | mariadb-git-4be2cfd62d077590420e7b4d1ab006ae014738cc.tar.gz | |
merging
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index fab666a1203..97e06997617 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -23,6 +23,7 @@ #endif #include <m_ctype.h> #include "sql_sort.h" +#include "assert.h" #ifndef THREAD #define SKIP_DBUG_IN_FILESORT @@ -83,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 @@ -579,6 +580,10 @@ static void make_sortkey(register SORTPARAM *param, change_double_for_sort(value,(byte*) to); break; } + case ROW_RESULT: + // This case should never be choosen + DBUG_ASSERT(0); + break; } } if (sort_field->reverse) @@ -965,6 +970,10 @@ sortlength(SORT_FIELD *sortorder, uint s_length) case REAL_RESULT: sortorder->length=sizeof(double); break; + case ROW_RESULT: + // This case should never be choosen + DBUG_ASSERT(0); + break; } if (sortorder->item->maybe_null) length++; // Place for NULL marker |