summaryrefslogtreecommitdiff
path: root/include/myisammrg.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/myisammrg.h')
-rw-r--r--include/myisammrg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/myisammrg.h b/include/myisammrg.h
index 76286000ff5..bfe14f5e1dd 100644
--- a/include/myisammrg.h
+++ b/include/myisammrg.h
@@ -14,7 +14,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA */
-/* This file should be included when using merge_isam_funktions */
+/* This file should be included when using merge_isam_functions */
#ifndef _myisammrg_h
#define _myisammrg_h
@@ -51,7 +51,7 @@ typedef struct st_mymerge_info /* Struct from h_info */
ulonglong data_file_length;
ulonglong dupp_key_pos; /* Offset of the Duplicate key in the merge table */
uint reclength; /* Recordlength */
- int errkey; /* With key was dupplicated on err */
+ int errkey; /* With key was duplicated on err */
uint options; /* HA_OPTION_... used */
ulong *rec_per_key; /* for sql optimizing */
} MYMERGE_INFO;