Commit 9b42b0a7 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

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

parents 967b5bff 36152722

Docs/manual.texi

+2 −0
Original line number Diff line number Diff line
@@ -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.

isam/pack_isam.c

+4 −3
Original line number Diff line number Diff line
@@ -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");

myisam/mi_cache.c

+2 −2
Original line number Diff line number Diff line
@@ -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 */