diff options
| author | monty@hundin.mysql.fi <> | 2001-11-03 15:18:09 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-11-03 15:18:09 +0200 |
| commit | 8cd4c2358de1581b36faa4d197508e232b1390b4 (patch) | |
| tree | d5d2a601f2e922dce27a5041739103c6468d4cf8 /sql/ha_myisammrg.cc | |
| parent | daa4229a3d54f72d1704e38355dacc0a7cbf1547 (diff) | |
| download | mariadb-git-8cd4c2358de1581b36faa4d197508e232b1390b4.tar.gz | |
Fix that mysqladmin shutdown can be interrupted with ^C
Fixed bug with BLOB keys in BDB tables
Fixed problem with MERGE tables on OS with 32 bit files
Fixed that TIME_TO_SEC() works with negative times
Diffstat (limited to 'sql/ha_myisammrg.cc')
| -rw-r--r-- | sql/ha_myisammrg.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc index 1feaa4e5d66..9499c42fdc9 100644 --- a/sql/ha_myisammrg.cc +++ b/sql/ha_myisammrg.cc @@ -175,7 +175,11 @@ void ha_myisammrg::info(uint flag) mean_rec_length=info.reclength; block_size=0; update_time=0; +#if SIZEOF_OFF_T > 4 ref_length=6; // Should be big enough +#else + ref_length=4; // Can't be > than my_off_t +#endif } |