summaryrefslogtreecommitdiff
path: root/include/myisam.h
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.com>2000-09-16 19:06:21 +0300
committerunknown <monty@donna.mysql.com>2000-09-16 19:06:21 +0300
commit5a4aa474d879ac9598941665bef6f0938efc91e1 (patch)
tree38f12ed194dbac086831cd3d00180599d1df8444 /include/myisam.h
parent8c6b365e7d8f19985e4732024524ac666f0c596c (diff)
downloadmariadb-git-5a4aa474d879ac9598941665bef6f0938efc91e1.tar.gz
Fix that REPAIR/ALTER TABLE use myisam_tempdir
include/myisam.h: Don't assume too big tempoary disks myisam/mi_check.c: Don't assume too big tempoary disks myisam/mi_static.c: Don't assume too big tempoary disks myisam/myisamdef.h: Fix type sql/ha_myisam.cc: Set myisamchk to use MySQL temporary disk space sql/slave.cc: Fix parameters sql/sql_lex.h: Added backup_dir
Diffstat (limited to 'include/myisam.h')
-rw-r--r--include/myisam.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/include/myisam.h b/include/myisam.h
index a2a17636b1d..b4e51c5f625 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -44,7 +44,7 @@ extern "C" {
#define MI_NAME_IEXT ".MYI"
#define MI_NAME_DEXT ".MYD"
/* Max extra space to use when sorting keys */
-#define MI_MAX_TEMP_LENGTH 1024L*1024L*1024L
+#define MI_MAX_TEMP_LENGTH 256*1024L*1024L
#define mi_portable_sizeof_char_ptr 8
@@ -187,8 +187,9 @@ typedef struct st_columndef /* column information */
extern my_string myisam_log_filename; /* Name of logfile */
extern uint myisam_block_size;
-extern my_bool myisam_flush,myisam_delay_key_write,
- myisam_concurrent_insert;
+extern my_bool myisam_flush,myisam_delay_key_write;
+extern my_bool myisam_concurrent_insert;
+extern my_off_t myisam_max_temp_length,myisam_max_extra_temp_length;
/* Prototypes for myisam-functions */
@@ -376,7 +377,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages,
ulong);
int test_if_almost_full(MI_INFO *info);
int recreate_table(MI_CHECK *param, MI_INFO **org_info, char *filename);
-void mi_dectivate_non_unique_index(MI_INFO *info, ha_rows rows);
+void mi_disable_non_unique_index(MI_INFO *info, ha_rows rows);
my_bool mi_test_if_sort_rep(MI_INFO *info, ha_rows rows);
#ifdef __cplusplus