database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

layout fix

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2002-11-27 19:16:06 +02:00
parent bfcd4a7197
commit 5f2016bb20
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/filesort.cc
View File

@@ -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

4
sql/item_cmpfunc.cc
View File

@@ -131,7 +131,7 @@ Compare_func_row::Compare_func_row(Item_bool_func2 *owner, Item *a, Item* b):
return;
}
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));
}
@@ -191,7 +191,7 @@ int Compare_func_row::compare(Item *a, Item *b)
{
int res= 0;
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))))
return res;