database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

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

Browse Source 
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
This commit is contained in:
unknown
2001-01-28 13:22:45 +01:00
parent 214366fd6d 7a70b21271
commit 12fd55a5a6
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
BitKeeper/etc/logging_ok
View File

@@ -1,9 +1,10 @@
jcole@tetra.spaceapes.com jcole@tetra.spaceapes.com
monty@donna.mysql.com monty@donna.mysql.com
monty@work.mysql.com
mwagner@work.mysql.com mwagner@work.mysql.com
paul@central.snake.net paul@central.snake.net
sasha@mysql.sashanet.com sasha@mysql.sashanet.com
sasha@work.mysql.com sasha@work.mysql.com
serg@donna.mysql.com serg@donna.mysql.com
serg@serg.mysql.com
tim@cane.mysql.fi tim@cane.mysql.fi
monty@work.mysql.com

2
Docs/manual.texi
View File

@@ -38946,7 +38946,7 @@ your @code{FULLTEXT} indexes.
@end example @end example
line in @code{myisam/ftdefs.h} to line in @code{myisam/ftdefs.h} to
@example @example
#define GWS_IN_USE GWS_IDF #define GWS_IN_USE GWS_FREQ
@end example @end example
and recompile @strong{MySQL}. and recompile @strong{MySQL}.
There is no need to rebuild the indexes though. There is no need to rebuild the indexes though.

6
libmysql/errmsg.c
View File

@@ -36,7 +36,7 @@ const char *client_errors[]=
"MySQL client got out of memory", "MySQL client got out of memory",
"Wrong host info", "Wrong host info",
"Localhost via UNIX socket", "Localhost via UNIX socket",
"%s via TCP/IP", "%-.64s via TCP/IP",
"Error in server handshake", "Error in server handshake",
"Lost connection to MySQL server during query", "Lost connection to MySQL server during query",
"Commands out of sync; You can't run this command now", "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", "MySQL client run out of memory",
"Wrong host info", "Wrong host info",
"Localhost via UNIX socket", "Localhost via UNIX socket",
"%s via TCP/IP", "%-.64s via TCP/IP",
"Error in server handshake", "Error in server handshake",
"Lost connection to MySQL server during query", "Lost connection to MySQL server during query",
"Commands out of sync; You can't run this command now", "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 wait for named pipe to host: %-.64s pipe: %-.32s (%lu)",
"Can't open 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)", "Can't set state of named pipe to host: %-.64s pipe: %-.32s (%lu)",

2
myisam/mi_check.c
View File

@@ -376,7 +376,7 @@ int chk_key(MI_CHECK *param, register MI_INFO *info)
if ((!(param->testflag & T_SILENT))) if ((!(param->testflag & T_SILENT)))
printf ("- check data record references index: %d\n",key+1); printf ("- check data record references index: %d\n",key+1);
if (share->state.key_root[key] == HA_OFFSET_ERROR && if (share->state.key_root[key] == HA_OFFSET_ERROR &&
info->state->records == 0) (info->state->records == 0 || keyinfo->flag & HA_FULLTEXT))
continue; continue;
if (!_mi_fetch_keypage(info,keyinfo,share->state.key_root[key],info->buff, if (!_mi_fetch_keypage(info,keyinfo,share->state.key_root[key],info->buff,
0)) 0))