summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-10-17 05:29:56 +0300
committerunknown <monty@donna.mysql.com>2000-10-17 05:29:56 +0300
commit08bb74b631c5b405b0a6cad155f6abc06a5fbf51 (patch)
treeb1301e0cd3ae889563b5899a0126e60d45721835 /myisam
parent6842cd1c059c53c44b8342e73ee031bf0a345b13 (diff)
downloadmariadb-git-08bb74b631c5b405b0a6cad155f6abc06a5fbf51.tar.gz
Fixes for automatic repair
Docs/manual.texi: Clarifications myisam/mi_check.c: Cleanup myisam/myisamdef.h: Header file fix sql/ha_myisam.cc: Fix for repair sql/sql_base.cc: Fix for repair
Diffstat (limited to 'myisam')
-rw-r--r--myisam/mi_check.c3
-rw-r--r--myisam/myisamdef.h7
2 files changed, 6 insertions, 4 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index 31d4aca1309..b95767d33cb 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -504,7 +504,8 @@ static int chk_index(MI_CHECK *param, MI_INFO *info, MI_KEYDEF *keyinfo,
if (used_length > keyinfo->block_length)
{
- mi_check_print_error(param,"Wrong pageinfo at page: %s", llstr(page,llbuff));
+ mi_check_print_error(param,"Wrong pageinfo at page: %s",
+ llstr(page,llbuff));
goto err;
}
for ( ;; )
diff --git a/myisam/myisamdef.h b/myisam/myisamdef.h
index 1af94de1990..a65694dbd94 100644
--- a/myisam/myisamdef.h
+++ b/myisam/myisamdef.h
@@ -575,6 +575,10 @@ enum myisam_log_commands {
#define myisam_log_command(a,b,c,d,e) if (myisam_log_file >= 0) _myisam_log_command(a,b,c,d,e)
#define myisam_log_record(a,b,c,d,e) if (myisam_log_file >= 0) _myisam_log_record(a,b,c,d,e)
+#ifdef __cplusplus
+extern "C" {
+#endif
+
extern uint _mi_get_block_info(MI_BLOCK_INFO *,File, my_off_t);
extern uint _mi_rec_pack(MI_INFO *info,byte *to,const byte *from);
extern uint _mi_pack_get_block_info(MI_INFO *mysql, MI_BLOCK_INFO *, File,
@@ -630,9 +634,6 @@ int mi_open_datafile(MI_INFO *info, MYISAM_SHARE *share);
int mi_open_keyfile(MYISAM_SHARE *share);
/* Functions needed by mi_check */
-#ifdef __cplusplus
-extern "C" {
-#endif
void mi_check_print_error _VARARGS((MI_CHECK *param, const char *fmt,...));
void mi_check_print_warning _VARARGS((MI_CHECK *param, const char *fmt,...));
void mi_check_print_info _VARARGS((MI_CHECK *param, const char *fmt,...));