summaryrefslogtreecommitdiff
path: root/storage/maria
diff options
context:
space:
mode:
Diffstat (limited to 'storage/maria')
-rw-r--r--storage/maria/ma_locking.c2
-rw-r--r--storage/maria/ma_loghandler.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_locking.c b/storage/maria/ma_locking.c
index 200a728626f..a377ab13c6a 100644
--- a/storage/maria/ma_locking.c
+++ b/storage/maria/ma_locking.c
@@ -282,7 +282,7 @@ int _ma_readinfo(register MARIA_HA *info __attribute__ ((unused)),
/*
- Every isam-function that uppdates the isam-database MUST end with this
+ Every isam-function that updates the isam-database MUST end with this
request
NOTES
diff --git a/storage/maria/ma_loghandler.c b/storage/maria/ma_loghandler.c
index 78f211c824e..35e47583720 100644
--- a/storage/maria/ma_loghandler.c
+++ b/storage/maria/ma_loghandler.c
@@ -957,7 +957,7 @@ char *translog_filename_by_fileno(uint32 file_no, char *path)
DBUG_ENTER("translog_filename_by_fileno");
DBUG_ASSERT(file_no <= 0xfffffff);
- /* log_descriptor.directory is already formated */
+ /* log_descriptor.directory is already formatted */
end= strxmov(path, log_descriptor.directory, "aria_log.0000000", NullS);
length= (uint) (int10_to_str(file_no, buff, 10) - buff);
strmov(end - length +1, buff);