mirror of
https://github.com/MariaDB/server.git
synced 2026-05-14 19:07:15 +02:00
layout fix
This commit is contained in:
parent
bcaa09771f
commit
e3114057d4
2 changed files with 4 additions and 3 deletions
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue