summaryrefslogtreecommitdiff
path: root/sql/filesort.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/filesort.cc')
-rw-r--r--sql/filesort.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 90edd39b1da..81ddc77a46b 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -856,7 +856,7 @@ static ha_rows find_all_keys(THD *thd, Sort_param *param, SQL_SELECT *select,
}
if (!quick_select)
{
- (void) file->extra(HA_EXTRA_NO_CACHE); /* End cacheing of records */
+ (void) file->extra(HA_EXTRA_NO_CACHE); /* End caching of records */
if (!next_pos)
file->ha_rnd_end();
}
@@ -864,7 +864,7 @@ static ha_rows find_all_keys(THD *thd, Sort_param *param, SQL_SELECT *select,
if (thd->is_error())
DBUG_RETURN(HA_POS_ERROR);
- /* Signal we should use orignal column read and write maps */
+ /* Signal we should use original column read and write maps */
sort_form->column_bitmaps_set(save_read_set, save_write_set, save_vcol_set);
DBUG_PRINT("test",("error: %d indexpos: %d",error,indexpos));
@@ -1141,7 +1141,7 @@ static void make_sortkey(Sort_param *param,
}
case ROW_RESULT:
default:
- // This case should never be choosen
+ // This case should never be chosen
DBUG_ASSERT(0);
break;
}
@@ -1927,7 +1927,7 @@ sortlength(THD *thd, SORT_FIELD *sortorder, uint s_length,
break;
case ROW_RESULT:
default:
- // This case should never be choosen
+ // This case should never be chosen
DBUG_ASSERT(0);
break;
}