summaryrefslogtreecommitdiff
path: root/isam
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-08-08 03:12:02 +0300
committermonty@mashka.mysql.fi <>2002-08-08 03:12:02 +0300
commit2c4fa340cccbf11dc7b7f944cf7ca30af48edf4f (patch)
treec44ce89903320c9d19cd6fe9767f75d997d2a1d0 /isam
parentbc035c71f1d94649253e4dac5fb8e5c981c7d834 (diff)
downloadmariadb-git-2c4fa340cccbf11dc7b7f944cf7ca30af48edf4f.tar.gz
Lots of code fixes to the replication code (especially the binary logging and index log file handling)
Fixed bugs in my last changeset that made MySQL hard to compile. Added mutex around some data that could cause table cache corruptions when using OPTIMIZE TABLE / REPAIR TABLE or automatic repair of MyISAM tables. Added mutex around some data in the slave start/stop code that could cause THD linked list corruptions Extended my_chsize() to allow one to specify a filler character. Extend vio_blocking to return the old state (This made some usage of this function much simpler) Added testing for some functions that they caller have got the required mutexes before calling the function. Use setrlimit() to ensure that we can write core file if one specifies --core-file. Added --slave-compressed-protocol Made 2 the minimum length for ft_min_word_len Added variables foreign_key_checks & unique_checks. Less logging from replication code (if not started with --log-warnings) Changed that SHOW INNODB STATUS requre the SUPER privilege More DBUG statements and a lot of new code comments
Diffstat (limited to 'isam')
-rw-r--r--isam/create.c4
-rw-r--r--isam/isamchk.c6
-rw-r--r--isam/pack_isam.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/isam/create.c b/isam/create.c
index 1fc2f3b97be..4c23f3edd11 100644
--- a/isam/create.c
+++ b/isam/create.c
@@ -294,13 +294,13 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo,
goto err;
/* Enlarge files */
- if (my_chsize(file,(ulong) share.base.keystart,MYF(0)))
+ if (my_chsize(file, (ulong) share.base.keystart, 0, MYF(0)))
goto err;
if (! (flags & HA_DONT_TOUCH_DATA))
{
#ifdef USE_RELOC
- if (my_chsize(dfile,share.base.min_pack_length*reloc,MYF(0)))
+ if (my_chsize(dfile, share.base.min_pack_length*reloc, 0, MYF(0)))
goto err;
#endif
errpos=1;
diff --git a/isam/isamchk.c b/isam/isamchk.c
index ea3055534ca..35b4e881962 100644
--- a/isam/isamchk.c
+++ b/isam/isamchk.c
@@ -1552,7 +1552,7 @@ my_string name;
{
VOID(fputs(" \r",stdout)); VOID(fflush(stdout));
}
- if (my_chsize(share->kfile,share->state.key_file_length,MYF(0)))
+ if (my_chsize(share->kfile, share->state.key_file_length, 0, MYF(0)))
{
print_warning("Can't change size of indexfile, error: %d",my_errno);
goto err;
@@ -2514,10 +2514,10 @@ my_string name;
skr=share->base.reloc*share->base.min_pack_length;
#endif
if (skr != sort_info.filelength)
- if (my_chsize(info->dfile,skr,MYF(0)))
+ if (my_chsize(info->dfile, skr, 0, MYF(0)))
print_warning("Can't change size of datafile, error: %d",my_errno);
}
- if (my_chsize(share->kfile,share->state.key_file_length,MYF(0)))
+ if (my_chsize(share->kfile, share->state.key_file_length, 0, MYF(0)))
print_warning("Can't change size of indexfile, error: %d",my_errno);
if (!(testflag & T_SILENT))
diff --git a/isam/pack_isam.c b/isam/pack_isam.c
index ca2685d3278..08cae65ef2c 100644
--- a/isam/pack_isam.c
+++ b/isam/pack_isam.c
@@ -1959,7 +1959,7 @@ static void save_state(N_INFO *isam_file,MRG_INFO *mrg,my_off_t new_length,
isam_file->update|=(HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
isam_file->this_uniq=crc; /* Save crc here */
share->changed=1; /* Force write of header */
- VOID(my_chsize(share->kfile,share->state.key_file_length,
+ VOID(my_chsize(share->kfile, share->state.key_file_length, 0,
MYF(0)));
if (share->state.keys != share->base.keys)
isamchk_neaded=1;