summaryrefslogtreecommitdiff
path: root/include/merge.h
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-09-12 23:53:31 +0300
committerunknown <monty@hundin.mysql.fi>2001-09-12 23:53:31 +0300
commit76989cf55c016a9d8619f582f753444241a4d934 (patch)
tree51a09b9e3466647e4386ab24f3c9aa89ff7a93b9 /include/merge.h
parenta53e8ea0ac4f7d53297b7942febf04e02d8c3b54 (diff)
downloadmariadb-git-76989cf55c016a9d8619f582f753444241a4d934.tar.gz
OS2 patch
Docs/manual.texi: Updated section of how to change the socket file. Changelog for 3.23.43 include/merge.h: Fixed typo include/my_pthread.h: Fixed bug for WIN32 include/myisam.h: Fixed typo include/nisam.h: Fixed typo sql/handler.h: Fixed typo sql/sql_table.cc: Fixed typo sql/unireg.cc: F
Diffstat (limited to 'include/merge.h')
-rw-r--r--include/merge.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/merge.h b/include/merge.h
index b090e49b471..c661e03a0c7 100644
--- a/include/merge.h
+++ b/include/merge.h
@@ -43,7 +43,7 @@ typedef struct st_mrg_info /* Struct from h_info */
ulonglong data_file_length;
uint reclength; /* Recordlength */
int errkey; /* With key was dupplicated on err */
- uint options; /* HA_OPTIONS_... used */
+ uint options; /* HA_OPTION_... used */
} MERGE_INFO;
typedef struct st_mrg_table_info