Commit 088bc46c authored by unknown's avatar unknown

Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql


configure.in:
  Auto merged
Docs/manual.texi:
  Auto merged
parents b9d64a6f 0ac01818
...@@ -46927,6 +46927,8 @@ not yet 100% confident in this code. ...@@ -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 @node News-3.23.52, News-3.23.51, News-3.23.x, News-3.23.x
@appendixsubsec Changes in release 3.23.52 @appendixsubsec Changes in release 3.23.52
@itemize @bullet @itemize @bullet
@code
Fixed a bug in range optimiser (causing crashes).
@item @item
Fixed possible problem in replication when doing @code{DROP DATABASE} on a Fixed possible problem in replication when doing @code{DROP DATABASE} on a
database with InnoDB tables. database with InnoDB tables.
...@@ -265,9 +265,10 @@ static void print_version(void) ...@@ -265,9 +265,10 @@ static void print_version(void)
static void usage(void) static void usage(void)
{ {
print_version(); print_version();
puts("Copyright (C) 1994-2000 TcX AB & Monty Program KB & Detron HB."); puts("Copyright (C) 2002 MySQL AB");
puts("This is not free software. You must have a licence to use this program"); puts("This software comes with ABSOLUTELY NO WARRANTY. This is free software,");
puts("This software comes with ABSOLUTELY NO WARRANTY\n"); 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("Pack a ISAM-table to take much smaller space");
puts("Keys are not updated, so you must run isamchk -rq on any table"); puts("Keys are not updated, so you must run isamchk -rq on any table");
puts("that has keys after you have compressed it"); puts("that has keys after you have compressed it");
......
...@@ -59,8 +59,8 @@ int _mi_read_cache(IO_CACHE *info, byte *buff, my_off_t pos, uint length, ...@@ -59,8 +59,8 @@ int _mi_read_cache(IO_CACHE *info, byte *buff, my_off_t pos, uint length,
in_buff_length=0; in_buff_length=0;
if (flag & READING_NEXT) if (flag & READING_NEXT)
{ {
if (pos != ((info)->pos_in_file + if (pos != (info->pos_in_file +
(uint) ((info)->rc_end - (info)->rc_request_pos))) (uint) (info->rc_end - info->rc_request_pos)))
{ {
info->pos_in_file=pos; /* Force start here */ info->pos_in_file=pos; /* Force start here */
info->rc_pos=info->rc_end=info->rc_request_pos; /* Everything used */ info->rc_pos=info->rc_end=info->rc_request_pos; /* Everything used */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment