summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2002-11-15 20:32:09 +0200
committerunknown <bell@sanja.is.com.ua>2002-11-15 20:32:09 +0200
commit3f742831211a4d53d97c5ac6ee402b4782de8776 (patch)
treebf6f2bb43cd9c75eef36dd94166c76c6b9d402af /sql/filesort.cc
parent5a8c6a33c22ed68acdccbde0649420cd8a80ad9d (diff)
downloadmariadb-git-3f742831211a4d53d97c5ac6ee402b4782de8776.tar.gz
basic row Items (SCRUM)
include/mysql_com.h: basic row Items include/mysqld_error.h: more wide error mening libmysqld/Makefile.am: basic row Items mysql-test/r/subselect.result: more wide error mening sql/Makefile.am: basic row Items sql/filesort.cc: basic row Items sql/item.cc: basic row Items sql/item.h: basic row Items sql/item_cmpfunc.cc: basic row Items sql/item_cmpfunc.h: basic row Items sql/item_func.cc: basic row Items sql/item_func.h: basic row Items sql/item_strfunc.cc: basic row Items sql/item_strfunc.h: basic row Items sql/item_subselect.cc: basic row Items sql/item_sum.cc: basic row Items sql/share/czech/errmsg.txt: more wide error mening sql/share/danish/errmsg.txt: more wide error mening sql/share/dutch/errmsg.txt: more wide error mening sql/share/english/errmsg.txt: more wide error mening sql/share/estonian/errmsg.txt: more wide error mening sql/share/french/errmsg.txt: more wide error mening sql/share/german/errmsg.txt: more wide error mening sql/share/greek/errmsg.txt: more wide error mening sql/share/hungarian/errmsg.txt: more wide error mening sql/share/italian/errmsg.txt: more wide error mening sql/share/japanese/errmsg.txt: more wide error mening sql/share/korean/errmsg.txt: more wide error mening sql/share/norwegian-ny/errmsg.txt: more wide error mening sql/share/norwegian/errmsg.txt: more wide error mening sql/share/polish/errmsg.txt: more wide error mening sql/share/portuguese/errmsg.txt: more wide error mening sql/share/romanian/errmsg.txt: more wide error mening sql/share/russian/errmsg.txt: more wide error mening sql/share/serbian/errmsg.txt: more wide error mening sql/share/slovak/errmsg.txt: more wide error mening sql/share/spanish/errmsg.txt: more wide error mening sql/share/swedish/errmsg.txt: more wide error mening sql/share/ukrainian/errmsg.txt: more wide error mening sql/sql_base.cc: fix_fields error handling sql/sql_lex.cc: basic row Items sql/sql_select.cc: basic row Items sql/sql_yacc.yy: basic row Items
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 53af60b0370..8247b52ad1b 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
@@ -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,9 @@ 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);
}
if (sortorder->item->maybe_null)
length++; // Place for NULL marker