diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-02-05 15:05:37 +0300 |
| commit | a45ea00b32a71ef5d123e102a7379f7d79a3dbbb (patch) | |
| tree | 0bf2d7fce335a1c38da55def00c6bfc5304db2ee /sql/filesort.cc | |
| parent | ad935d47088485c59e6425347307b7b908790e3d (diff) | |
| parent | 619037517f6827131f0f6367df57e28d1b695626 (diff) | |
| download | mariadb-git-a45ea00b32a71ef5d123e102a7379f7d79a3dbbb.tar.gz | |
Manual merge from mysql-next-mr.
Conflicts:
- sql/sys_vars.cc
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index c6156b8243f..79887577f8f 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -145,6 +145,8 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, error= 1; bzero((char*) ¶m,sizeof(param)); param.sort_length= sortlength(thd, sortorder, s_length, &multi_byte_charset); + /* filesort cannot handle zero-length records. */ + DBUG_ASSERT(param.sort_length); param.ref_length= table->file->ref_length; param.addon_field= 0; param.addon_length= 0; |