Commit 5f2016bb authored by bell@sanja.is.com.ua's avatar bell@sanja.is.com.ua

layout fix

parent bfcd4a71
...@@ -84,7 +84,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length, ...@@ -84,7 +84,7 @@ ha_rows filesort(THD *thd, TABLE *table, SORT_FIELD *sortorder, uint s_length,
#endif #endif
// BAR TODO: this is not absolutely correct, but OK for now // 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()) if (!table->field[i]->binary())
charset=table->field[i]->charset(); charset=table->field[i]->charset();
// /BAR TODO // /BAR TODO
...@@ -973,6 +973,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length) ...@@ -973,6 +973,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
case ROW_RESULT: case ROW_RESULT:
// This case should never be choosen // This case should never be choosen
DBUG_ASSERT(0); DBUG_ASSERT(0);
break;
} }
if (sortorder->item->maybe_null) if (sortorder->item->maybe_null)
length++; // Place for NULL marker length++; // Place for NULL marker
......
...@@ -131,7 +131,7 @@ Compare_func_row::Compare_func_row(Item_bool_func2 *owner, Item *a, Item* b): ...@@ -131,7 +131,7 @@ Compare_func_row::Compare_func_row(Item_bool_func2 *owner, Item *a, Item* b):
return; return;
} }
cmp_func= (Compare_func **) sql_alloc(sizeof(Compare_func*)*n); cmp_func= (Compare_func **) sql_alloc(sizeof(Compare_func*)*n);
for(uint i=0; i < n; i++) for (uint i=0; i < n; i++)
cmp_func[i]= Compare_func::get_compare_func(owner, a->el(i), b->el(i)); cmp_func[i]= Compare_func::get_compare_func(owner, a->el(i), b->el(i));
} }
...@@ -191,7 +191,7 @@ int Compare_func_row::compare(Item *a, Item *b) ...@@ -191,7 +191,7 @@ int Compare_func_row::compare(Item *a, Item *b)
{ {
int res= 0; int res= 0;
uint n= a->cols(); uint n= a->cols();
for(uint i= 0; i<n; i++) for (uint i= 0; i<n; i++)
{ {
if ((res= cmp_func[i]->compare(a->el(i), b->el(i)))) if ((res= cmp_func[i]->compare(a->el(i), b->el(i))))
return res; return res;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment