Commit 8efd73dc authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

Merge work:/home/bk/mysql into serg.mysql.com:/usr/home/serg/Abk/mysql

parents 75e0c1a8 e47833bc

BitKeeper/etc/logging_ok

+2 −1
Original line number Diff line number Diff line 
jcole@tetra.spaceapes.com

monty@donna.mysql.com

monty@work.mysql.com

mwagner@work.mysql.com

paul@central.snake.net

sasha@mysql.sashanet.com

sasha@work.mysql.com

serg@donna.mysql.com

serg@serg.mysql.com

tim@cane.mysql.fi
 
monty@work.mysql.com

Docs/manual.texi

+1 −1
Original line number Diff line number Diff line
@@ -38946,7 +38946,7 @@ your @code{FULLTEXT} indexes. 
@end example

line in @code{myisam/ftdefs.h} to

@example

#define GWS_IN_USE GWS_IDF

#define GWS_IN_USE GWS_FREQ

@end example

and recompile @strong{MySQL}.

There is no need to rebuild the indexes though.

libmysql/errmsg.c

+3 −3
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ const char *client_errors[]= 
  "MySQL client got out of memory",

  "Wrong host info",

  "Localhost via UNIX socket",

  "%s via TCP/IP",

  "%-.64s via TCP/IP",

  "Error in server handshake",

  "Lost connection to MySQL server during query",

  "Commands out of sync; You can't run this command now",
@@ -62,11 +62,11 @@ const char *client_errors[]= 
  "MySQL client run out of memory",

  "Wrong host info",

  "Localhost via UNIX socket",

  "%s via TCP/IP",

  "%-.64s via TCP/IP",

  "Error in server handshake",

  "Lost connection to MySQL server during query",

  "Commands out of sync;  You can't run this command now",

  "%s via named pipe",

  "%-.64s via named pipe",

  "Can't wait for named pipe to host: %-.64s  pipe: %-.32s (%lu)",

  "Can't open named pipe to host: %-.64s  pipe: %-.32s (%lu)",

  "Can't set state of named pipe to host: %-.64s  pipe: %-.32s (%lu)",

myisam/mi_check.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info) 
    if ((!(param->testflag & T_SILENT)))

      printf ("- check data record references index: %d\n",key+1);

    if (share->state.key_root[key] == HA_OFFSET_ERROR &&

	info->state->records == 0)

	(info->state->records == 0 || keyinfo->flag & HA_FULLTEXT))

      continue;

    if (!_mi_fetch_keypage(info,keyinfo,share->state.key_root[key],info->buff,

			   0))