diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-11-27 19:16:06 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-11-27 19:16:06 +0200 |
| commit | e3114057d4f397e0f8c3c8f98a8caf7ce06d8197 (patch) | |
| tree | f8ec3d1743633a851c9fabf7cf17ac12620c12a6 /sql | |
| parent | bcaa09771f9bd37ffbb4b00b9b598add14215ca7 (diff) | |
| download | mariadb-git-e3114057d4f397e0f8c3c8f98a8caf7ce06d8197.tar.gz | |
layout fix
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/filesort.cc | 3 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index 8247b52ad1b..e2a108bfccc 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -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 diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 81e1ca8a031..545db7ce4df 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -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; |