diff options
| -rw-r--r-- | Docs/manual.texi | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | isam/pack_isam.c | 7 | ||||
| -rw-r--r-- | myisam/mi_cache.c | 4 |
4 files changed, 9 insertions, 6 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index f987ff94f98..7c20b08164e 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -46927,6 +46927,8 @@ not yet 100% confident in this code. @node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x @appendixsubsec Changes in release 3.23.52 @itemize @bullet +@code +Fixed a bug in range optimiser (causing crashes). @item Fixed possible problem in replication when doing @code{DROP DATABASE} on a database with InnoDB tables. diff --git a/configure.in b/configure.in index 00c986c4006..0869ce43e6d 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.51) +AM_INIT_AUTOMAKE(mysql, 3.23.52) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 diff --git a/isam/pack_isam.c b/isam/pack_isam.c index e7b5170d398..5a66a9cb33c 100644 --- a/isam/pack_isam.c +++ b/isam/pack_isam.c @@ -265,9 +265,10 @@ static void print_version(void) static void usage(void) { print_version(); - puts("Copyright (C) 1994-2000 TcX AB & Monty Program KB & Detron HB."); - puts("This is not free software. You must have a licence to use this program"); - puts("This software comes with ABSOLUTELY NO WARRANTY\n"); + puts("Copyright (C) 2002 MySQL AB"); + puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,"); + puts("and you are welcome to modify and redistribute it under the GPL license\n"); + puts("Pack a ISAM-table to take much smaller space"); puts("Keys are not updated, so you must run isamchk -rq on any table"); puts("that has keys after you have compressed it"); diff --git a/myisam/mi_cache.c b/myisam/mi_cache.c index 69a1cb0d7a5..f88725ff04b 100644 --- a/myisam/mi_cache.c +++ b/myisam/mi_cache.c @@ -59,8 +59,8 @@ int _mi_read_cache(IO_CACHE *info, byte *buff, my_off_t pos, uint length, in_buff_length=0; if (flag & READING_NEXT) { - if (pos != ((info)->pos_in_file + - (uint) ((info)->rc_end - (info)->rc_request_pos))) + if (pos != (info->pos_in_file + + (uint) (info->rc_end - info->rc_request_pos))) { info->pos_in_file=pos; /* Force start here */ info->rc_pos=info->rc_end=info->rc_request_pos; /* Everything used */ |