summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 21922ec9d73..40dea349272 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -745,7 +745,7 @@ int ha_end()
DBUG_ENTER("ha_end");
/*
- This should be eventualy based on the graceful shutdown flag.
+ This should be eventually based on the graceful shutdown flag.
So if flag is equal to HA_PANIC_CLOSE, the deallocate
the errors.
*/
@@ -1406,8 +1406,8 @@ int ha_commit_trans(THD *thd, bool all)
THD_TRANS *trans= all ? &thd->transaction.all : &thd->transaction.stmt;
/*
"real" is a nick name for a transaction for which a commit will
- make persistent changes. E.g. a 'stmt' transaction inside a 'all'
- transation is not 'real': even though it's possible to commit it,
+ make persistent changes. E.g. a 'stmt' transaction inside an 'all'
+ transaction is not 'real': even though it's possible to commit it,
the changes are not durable as they might be rolled back if the
enclosing 'all' transaction is rolled back.
*/
@@ -2672,7 +2672,7 @@ handler *handler::clone(const char *name, MEM_ROOT *mem_root)
/*
TODO: Implement a more efficient way to have more than one index open for
- the same table instance. The ha_open call is not cachable for clone.
+ the same table instance. The ha_open call is not cacheable for clone.
This is not critical as the engines already have the table open
and should be able to use the original instance of the table.
@@ -3529,7 +3529,7 @@ int handler::update_auto_increment()
index_init() or rnd_init() and in any column_bitmaps_signal() call after
this.
- The handler is allowd to do changes to the bitmap after a index_init or
+ The handler is allowed to do changes to the bitmap after a index_init or
rnd_init() call is made as after this, MySQL will not use the bitmap
for any program logic checking.
*/
@@ -3592,7 +3592,7 @@ void handler::get_auto_increment(ulonglong offset, ulonglong increment,
{ // Autoincrement at key-start
error= ha_index_last(table->record[1]);
/*
- MySQL implicitely assumes such method does locking (as MySQL decides to
+ MySQL implicitly assumes such method does locking (as MySQL decides to
use nr+increment without checking again with the handler, in
handler::update_auto_increment()), so reserves to infinite.
*/
@@ -6615,7 +6615,7 @@ static int check_duplicate_long_entry_key(TABLE *table, handler *h,
DBUG_ASSERT(fnc->arguments()[0]->type() == Item::FIELD_ITEM);
t_field= static_cast<Item_field *>(fnc->arguments()[0])->field;
uint length= (uint)fnc->arguments()[1]->val_int();
- if (t_field->cmp_max(t_field->ptr, t_field->ptr + diff, length))
+ if (t_field->cmp_prefix(t_field->ptr, t_field->ptr + diff, length))
is_same= false;
}
}