diff options
| -rw-r--r-- | .bzrignore | 13 | ||||
| -rw-r--r-- | Docs/manual.texi | 25 | ||||
| -rw-r--r-- | mysys/my_open.c | 7 | ||||
| -rw-r--r-- | sql/ha_myisam.cc | 5 | ||||
| -rw-r--r-- | sql/opt_range.cc | 1 | ||||
| -rw-r--r-- | sql/share/czech/errmsg.sys | bin | 10526 -> 10564 bytes | |||
| -rw-r--r-- | sql/share/czech/errmsg.txt | 33 | ||||
| -rw-r--r-- | sql/share/italian/errmsg.sys | bin | 11421 -> 11466 bytes | |||
| -rw-r--r-- | sql/share/italian/errmsg.txt | 6 |
9 files changed, 55 insertions, 35 deletions
diff --git a/.bzrignore b/.bzrignore index 06b9e724b45..d0f97026511 100644 --- a/.bzrignore +++ b/.bzrignore @@ -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 diff --git a/Docs/manual.texi b/Docs/manual.texi index 0d1be9b735f..65b7abd976e 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -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: diff --git a/mysys/my_open.c b/mysys/my_open.c index aadf197d2cb..a8dbe86989b 100644 --- a/mysys/my_open.c +++ b/mysys/my_open.c @@ -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 diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 223e14b06c7..860418a3fe4 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -236,10 +236,12 @@ int ha_myisam::write_row(byte * buf) int ha_myisam::check(THD* thd, HA_CHECK_OPT* check_opt) { if (!file) return HA_ADMIN_INTERNAL_ERROR; - int error ; + 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(¶m); 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; } diff --git a/sql/opt_range.cc b/sql/opt_range.cc index 0bfc9dae593..dfd45933999 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -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(); } diff --git a/sql/share/czech/errmsg.sys b/sql/share/czech/errmsg.sys Binary files differindex 8fb8d9630c2..ebb6e9ba348 100644 --- a/sql/share/czech/errmsg.sys +++ b/sql/share/czech/errmsg.sys diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt index ae0369e3f17..437702240c7 100644 --- a/sql/share/czech/errmsg.txt +++ b/sql/share/czech/errmsg.txt @@ -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 - ISO LATIN-8852-2 - Upravil Jan Pazdziora, adelton@fi.muni.cz - Tue Nov 18 17:53:55 MET 1997 verze 0.02 - Roz-Bšíř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šíř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 +/* + Modifikoval Petr -BŠnajdr, snajdr@pvt.net, snajdr@cpress.cz v.0.01 -A + ISO LATIN-8852-2 + Dal-Bší 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íťová chyba při čtení z masteru",-A "S-Bíťová chyba při zápisu na master",-A "-BŽádný sloupec nemá vytvořen fulltextový 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ý příkaz, protože existují aktivní zamčené tabulky nebo aktivní transakce",-A +"Nezn-Bámá systémová proměnná '%-.64'",-A +"Tabulka '%-.64s' je ozna-Bčena jako porušená a měla by být opravena",-A +"Tabulka '%-.64s' je ozna-Bčena jako porušená a poslední (automatická?) oprava se nezdařila",-A "Warning: Some non-transactional changed tables couldn't be rolled back", diff --git a/sql/share/italian/errmsg.sys b/sql/share/italian/errmsg.sys Binary files differindex 045e64ce093..7aea0464d7a 100644 --- a/sql/share/italian/errmsg.sys +++ b/sql/share/italian/errmsg.sys diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt index a88df6dcc0e..44dbfd63a7b 100644 --- a/sql/share/italian/errmsg.txt +++ b/sql/share/italian/errmsg.txt @@ -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", |