diff options
| author | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-04-01 17:57:30 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com/narttu.mysql.fi> | 2008-04-01 17:57:30 +0300 |
| commit | 3651e3285d11c42a77e332009155b96132e5ba6e (patch) | |
| tree | 27698eaec5a94020dafa1c0870190cd4b1c5d7cf /storage/maria/ma_statrec.c | |
| parent | c63e18f43c1054db92c798e54ba9520fc16ea607 (diff) | |
| download | mariadb-git-3651e3285d11c42a77e332009155b96132e5ba6e.tar.gz | |
Merge of changes in MyISAM since December 16 -> April 1
Fixes bugs:
Bug#28837 MyISAM storage engine error (134) doing delete with self-join
Bug#31277 myisamchk --unpack corrupts table
Bug#4692 DISABLE/ENABLE KEYS waste a space
Bug#31305 myisam tables crash when they are near capacity
BitKeeper/etc/ignore:
added unittest/tmp/*
mysql-test/r/maria.result:
Moved missing tests from myisam.test to maria.test
mysql-test/t/maria.test:
Moved missing tests from myisam.test to maria.test
storage/maria/ha_maria.cc:
Merge of changes in MyISAM since December 16 -> April 1
Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
storage/maria/ha_maria.h:
Merge of changes in MyISAM since December 16 -> April 1
storage/maria/ma_blockrec.c:
Merge of changes in MyISAM since December 16 -> April 1
Fixes bug in self join (Bug#28837: MyISAM storage engine error (134) doing delete with self-join)
The problem is that we may be using a cached key page with old information. Versioning will fix this
storage/maria/ma_check.c:
Merge of changes in MyISAM since December 16 -> April 1
This fixes a problem with pack_reclength not beeing big enough (Bug #31277 myisamchk --unpack corrupts table)
BUG#4692 - DISABLE/ENABLE KEYS waste a space
storage/maria/ma_delete.c:
Indentation fixes
storage/maria/ma_dynrec.c:
Merge of changes in MyISAM since December 16 -> April 1
Fixes Bug#31305 myisam tables crash when they are near capacity.
(This uses a simpler fix than in MyISAM by remembering the length of the current row)
storage/maria/ma_ft_boolean_search.c:
Merge of all changes from myisam/ft_boolean_search.c (This file had not been kept up to date)
storage/maria/ma_open.c:
Merge of changes in MyISAM since December 16 -> April 1
Calculate default_rec_buff_size more exact to be sure it's always big enough
storage/maria/ma_packrec.c:
Merge of changes in MyISAM since December 16 -> April 1
Update default_rec_buff_size to be big enough to hold one packed row
Related to Bug#31277 myisamchk --unpack corrupts table
storage/maria/ma_rnext_same.c:
Indentation fixes
storage/maria/ma_rt_index.c:
Merge of changes in MyISAM since December 16 -> April 1
storage/maria/ma_rt_mbr.c:
Merge of changes in MyISAM since December 16 -> April 1
(Added comment)
storage/maria/ma_search.c:
Merge of changes in MyISAM since December 16 -> April 1
(Added comment)
storage/maria/ma_sort.c:
Merge of changes in MyISAM since December 16 -> April 1
storage/maria/ma_statrec.c:
Indentation fixes
storage/maria/ma_test2.c:
Indentation fixes
storage/maria/maria_chk.c:
Indentation fixes
storage/maria/maria_pack.c:
Merge of changes in MyISAM since December 16 -> April 1
Diffstat (limited to 'storage/maria/ma_statrec.c')
| -rw-r--r-- | storage/maria/ma_statrec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_statrec.c b/storage/maria/ma_statrec.c index 3e744e12045..43915ff5ec0 100644 --- a/storage/maria/ma_statrec.c +++ b/storage/maria/ma_statrec.c @@ -62,8 +62,8 @@ my_bool _ma_write_static_record(MARIA_HA *info, const uchar *record) { info->rec_cache.seek_not_done=1; /* We have done a seek */ if (info->s->file_write(info, record, info->s->base.reclength, - info->state->data_file_length, - info->s->write_flag)) + info->state->data_file_length, + info->s->write_flag)) goto err; if (info->s->base.pack_reclength != info->s->base.reclength) { |