database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

New error messages

Browse Source 
Fix for creating read-only files on windows
Manual updates
This commit is contained in:
monty@donna.mysql.com
2000-12-05 03:00:31 +02:00
parent d37bcf7b36
commit 38fce965ea
9 changed files with 55 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.bzrignore
View File

@ -379,3 +379,16 @@ support-files/mysql-3.23.29-gamma.spec
support-files/mysql-log-rotate
support-files/mysql.server
support-files/mysql.spec
Docs/manual.aux
Docs/manual.cp
Docs/manual.cps
Docs/manual.dvi
Docs/manual.fn
Docs/manual.fns
Docs/manual.ky
Docs/manual.pg
Docs/manual.toc
Docs/manual.tp
Docs/manual.vr
Docs/manual_a4.ps
Docs/manual_letter.ps

25
Docs/manual.texi
View File

@ -7491,6 +7491,10 @@ It is recomended you use MIT-pthreads on FreeBSD 2.x and native threads on
Versions 3 and up. It is possible to run with native threads on some late
2.2.x versions but you may encounter problems shutting down mysqld.
The @strong{MYSQL} Makefiles require GNU make (@code{gmake}) to work.
If you want to compile @strong{MYSQL} you need to install GNU make
first.
Be sure to have your name resolver setup correct. Otherwise you may
experience resolver delays or failures when connecting to mysqld.
@ -7514,10 +7518,6 @@ shell> rm config.cache
shell> ./configure --with-mit-threads
@end example
The behavior of FreeBSD @code{make} is slightly different from that of GNU
@code{make}. If you have @code{make}-related problems, you should install GNU
@code{make}.
FreeBSD is also known to have a very low default file handle limit.
@xref{Not enough file handles}. Uncomment the ulimit -n section in
safe_mysqld or raise the limits for the mysqld user in /etc/login.conf
@ -20233,11 +20233,11 @@ start @code{mysqld} with @code{--skip-bdb} o not waste memory for this cache.
The value of the @code{--bdb-home} option.
@item @code{bdb_lock_max}
The maximum number of locks (1000 by default) you can have active on a BDB
table. You should increase this if you get errors of type
@code{bdb: Lock table is out of available locks} when you have do long
transactions or when mysqld has to examine a lot of rows to calculate
the query.
The maximum number of locks (1000 by default) you can have active on a
BDB table. You should increase this if you get errors of type @code{bdb:
Lock table is out of available locks} or @code{Got error 12 from ...}
when you have do long transactions or when @code{mysqld} has to examine
a lot of rows to calculate the query.
@item @code{bdb_logdir}
The value of the @code{--bdb-logdir} option.
@ -22519,6 +22519,13 @@ Normally you should start mysqld with @code{--bdb-recover} if you intend
to use BDB tables. This may, however, give you problems when you try to
start mysqld if the BDB log files are corrupted. @xref{Starting server}.
With @code{bdb_lock_max} you can specify the maximum number of locks
(1000 by default) you can have active on a BDB table. You should
increase this if you get errors of type @code{bdb: Lock table is out of
available locks} or @code{Got error 12 from ...} when you have do long
transactions or when @code{mysqld} has to examine a lot of rows to
calculate the query.
@node BDB characteristic, BDB TODO, BDB start, BDB
@subsection Some characteristic of @code{BDB} tables:

7
mysys/my_open.c
View File

@ -18,6 +18,7 @@
#define USES_TYPES
#include "mysys_priv.h"
#include "mysys_err.h"
#include <my_dir.h>
#include <errno.h>
#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)
#include <share.h>
@ -36,9 +37,11 @@ File my_open(const char *FileName, int Flags, myf MyFlags)
FileName, Flags, MyFlags));
#if defined(MSDOS) || defined(__WIN__) || defined(__EMX__)
if (Flags & O_SHARE)
fd = sopen((my_string) FileName, (Flags & ~O_SHARE) | O_BINARY, SH_DENYNO);
fd = sopen((my_string) FileName, (Flags & ~O_SHARE) | O_BINARY, SH_DENYNO,
MY_S_IREAD | MY_S_IWRITE);
else
fd = open((my_string) FileName, Flags | O_BINARY);
fd = open((my_string) FileName, Flags | O_BINARY,
MY_S_IREAD | MY_S_IWRITE);
#elif !defined(NO_OPEN_3)
fd = open(FileName, Flags, my_umask); /* Normal unix */
#else

3
sql/ha_myisam.cc
View File

@ -239,7 +239,9 @@ int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
int error;
MI_CHECK param;
MYISAM_SHARE* share = file->s;
const char *old_proc_info=thd->proc_info;
thd->proc_info="Checking table";
myisamchk_init(&param);
param.thd = thd;
param.op_name = (char*)"check";
@ -306,6 +308,7 @@ int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt)
}
check_opt->retry_without_quick=param.retry_without_quick;
thd->proc_info=old_proc_info;
return error ? HA_ADMIN_CORRUPT : HA_ADMIN_OK;
}

1
sql/opt_range.cc
View File

@ -393,7 +393,6 @@ QUICK_SELECT::QUICK_SELECT(TABLE *table,uint key_nr,bool no_alloc)
else
bzero((char*) &alloc,sizeof(alloc));
file=head->file;
error=file->index_init(index);
record=head->record[0];
init();
}

BIN
sql/share/czech/errmsg.sys
View File

Binary file not shown.

31
sql/share/czech/errmsg.txt
View File

@ -1,18 +1,13 @@
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind */
/* Modifikoval Petr -B<>najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A
/*
Modifikoval Petr -B<>najdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A
ISO LATIN-8852-2
Upravil Jan Pazdziora, adelton@fi.muni.cz
Tue Nov 18 17:53:55 MET 1997 verze 0.02
Roz-B<><42><EFBFBD>eno podle 3.21.15c Jan Pazdziora, adelton@fi.muni.cz-A
Tue Dec 2 19:08:54 MET 1997 verze 0.03
Roz-B<><42><EFBFBD>eno podle 3.21.29 Jan Pazdziora, adelton@fi.muni.cz-A
Thu May 7 17:40:49 MET DST 1998 verze 0.04
Podle verze 3.22.20 upravil Jan Pazdziora, adelton@fi.muni.cz
Thu Apr 1 20:49:57 CEST 1999
Podle verze 3.23.2 upravil Jan Pazdziora, adelton@fi.muni.cz
Mon Aug 9 13:30:09 MET DST 1999
Dal-B<><42> verze Jan Pazdziora, adelton@fi.muni.cz-A
Tue Nov 18 17:53:55 MET 1997
Tue Dec 2 19:08:54 MET 1997 podle 3.21.15c
Thu May 7 17:40:49 MET DST 1998 podle 3.21.29
Thu Apr 1 20:49:57 CEST 1999 podle 3.22.20
Mon Aug 9 13:30:09 MET DST 1999 podle 3.23.2
Thu Nov 30 14:02:52 MET 2000 podle 3.23.28
*/
"hashchk",
@ -207,8 +202,8 @@
"S-B<><42>ov<6F> chyba p<>i <20>ten<65> z masteru",-A
"S-B<><42>ov<6F> chyba p<>i z<>pisu na master",-A
"-B<><42>dn<64> sloupec nem<65> vytvo<76>en fulltextov<6F> index",-A
"Can't execute the given command because you have active locked tables or an active transaction",
"Unknown system variable '%-.64'",
"Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Nemohu prov-B<>st zadan<61> p<><70>kaz, proto<74>e existuj<75> aktivn<EFBFBD> zam<61>en<65> tabulky nebo aktivn<EFBFBD> transakce",-A
"Nezn-B<>m<EFBFBD> syst<73>mov<6F> prom<6F>nn<6E> '%-.64'",-A
"Tabulka '%-.64s' je ozna-B<>ena jako poru<72>en<65> a m<>la by b<>t opravena",-A
"Tabulka '%-.64s' je ozna-B<>ena jako poru<72>en<65> a posledn<64> (automatick<EFBFBD>?) oprava se nezda<64>ila",-A
"Warning: Some non-transactional changed tables couldn't be rolled back",

BIN
sql/share/italian/errmsg.sys
View File

Binary file not shown.

6
sql/share/italian/errmsg.txt
View File

@ -194,7 +194,7 @@
"Errore di rete inviando al master",
"Impossibile trovare un indice FULLTEXT che corrisponda all'elenco delle colonne",
"Can't execute the given command because you have active locked tables or an active transaction",
"Unknown system variable '%-.64'",
"Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Variabile di sistema '%-.64' sconosciuta",
"La tabella '%-.64s' e' segnalata come rovinata e deve essere riparata",
"La tabella '%-.64s' e' segnalata come rovinata e l'ultima ricostruzione (automatica?) e' fallita",
"Warning: Some non-transactional changed tables couldn't be rolled back",