Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.1965 05/11/24 02:56:12 monty@stripped +18 -0
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
sql/share/errmsg.txt
1.56 05/11/24 02:56:09 monty@stripped +38 -46
manual merge
sql/examples/ha_tina.cc
1.23 05/11/24 02:56:09 monty@stripped +4 -6
manual merge
sql/unireg.h
1.44 05/11/24 02:38:33 monty@stripped +0 -0
Auto merged
sql/tztime.cc
1.29 05/11/24 02:38:33 monty@stripped +0 -0
Auto merged
sql/sql_udf.cc
1.58 05/11/24 02:38:33 monty@stripped +0 -0
Auto merged
sql/sql_parse.cc
1.486 05/11/24 02:38:33 monty@stripped +0 -0
Auto merged
sql/sql_insert.cc
1.174 05/11/24 02:38:33 monty@stripped +0 -0
Auto merged
sql/examples/ha_tina.h
1.8 05/11/24 02:38:33 monty@stripped +0 -0
Auto merged
sql/sql_class.cc
1.221 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
sql/sql_base.cc
1.280 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
sql/sql_acl.cc
1.162 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
sql/slave.cc
1.258 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
sql/mysql_priv.h
1.345 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
sql/ha_federated.cc
1.43 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
mysql-test/r/grant.result
1.43 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
mysql-test/mysql-test-run.pl
1.42 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
include/my_global.h
1.116 05/11/24 02:38:32 monty@stripped +0 -0
Auto merged
BitKeeper/etc/ignore
1.215 05/11/24 02:38:17 monty@stripped +1 -1
auto-union
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: narttu.mysql.fi
# Root: /home/my/mysql-5.1/RESYNC
--- 1.344/sql/mysql_priv.h 2005-11-19 11:41:37 +02:00
+++ 1.345/sql/mysql_priv.h 2005-11-24 02:38:32 +02:00
@@ -101,6 +101,7 @@
#define MAX_FIELDS_BEFORE_HASH 32
#define USER_VARS_HASH_SIZE 16
#define STACK_MIN_SIZE 8192 // Abort if less stack during eval.
+#define STACK_MIN_SIZE_FOR_OPEN 1024*80
#define STACK_BUFF_ALLOC 256 // For stack overrun checks
#ifndef MYSQLD_NET_RETRY_COUNT
#define MYSQLD_NET_RETRY_COUNT 10 // Abort read after this many int.
--- 1.257/sql/slave.cc 2005-11-23 14:04:09 +02:00
+++ 1.258/sql/slave.cc 2005-11-24 02:38:32 +02:00
@@ -3070,6 +3070,7 @@
THD_CHECK_SENTRY(thd);
pthread_detach_this_thread();
+ thd->thread_stack= (char*) &thd; // remember where our stack is
if (init_slave_thread(thd, SLAVE_THD_IO))
{
pthread_cond_broadcast(&mi->start_cond);
@@ -3078,7 +3079,6 @@
goto err;
}
mi->io_thd = thd;
- thd->thread_stack = (char*)&thd; // remember where our stack is
pthread_mutex_lock(&LOCK_thread_count);
threads.append(thd);
pthread_mutex_unlock(&LOCK_thread_count);
--- 1.161/sql/sql_acl.cc 2005-11-23 14:04:10 +02:00
+++ 1.162/sql/sql_acl.cc 2005-11-24 02:38:32 +02:00
@@ -157,6 +157,7 @@
*/
if (!(thd=new THD))
DBUG_RETURN(1); /* purecov: inspected */
+ thd->thread_stack= (char*) &thd;
thd->store_globals();
/*
It is safe to call acl_reload() since acl_* arrays and hashes which
@@ -3263,6 +3264,7 @@
if (!(thd= new THD))
DBUG_RETURN(1); /* purecov: deadcode */
+ thd->thread_stack= (char*) &thd;
thd->store_globals();
return_val= grant_reload(thd);
delete thd;
--- 1.279/sql/sql_base.cc 2005-11-23 14:04:10 +02:00
+++ 1.280/sql/sql_base.cc 2005-11-24 02:38:32 +02:00
@@ -1090,7 +1090,7 @@
*refresh=0;
/* an open table operation needs a lot of the stack space */
- if (check_stack_overrun(thd, 8 * STACK_MIN_SIZE, (char *)&alias))
+ if (check_stack_overrun(thd, STACK_MIN_SIZE_FOR_OPEN, (char *)&alias))
return 0;
if (thd->killed)
--- 1.220/sql/sql_class.cc 2005-11-23 14:04:12 +02:00
+++ 1.221/sql/sql_class.cc 2005-11-24 02:38:32 +02:00
@@ -517,6 +517,12 @@
bool THD::store_globals()
{
+ /*
+ Assert that thread_stack is initialized: it's necessary to be able
+ to track stack overrun.
+ */
+ DBUG_ASSERT(this->thread_stack);
+
if (my_pthread_setspecific_ptr(THR_THD, this) ||
my_pthread_setspecific_ptr(THR_MALLOC, &mem_root))
return 1;
--- 1.173/sql/sql_insert.cc 2005-11-04 22:09:56 +02:00
+++ 1.174/sql/sql_insert.cc 2005-11-24 02:38:33 +02:00
@@ -1736,6 +1736,7 @@
#endif
DBUG_ENTER("handle_delayed_insert");
+ thd->thread_stack= (char*) &thd;
if (init_thr_lock() || thd->store_globals())
{
thd->fatal_error();
--- 1.485/sql/sql_parse.cc 2005-11-23 14:04:13 +02:00
+++ 1.486/sql/sql_parse.cc 2005-11-24 02:38:33 +02:00
@@ -1091,6 +1091,7 @@
VOID(sigemptyset(&set)); // Get mask in use
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
#endif
+ thd->thread_stack= (char*) &thd;
if (thd->store_globals())
{
close_connection(thd, ER_OUT_OF_RESOURCES, 1);
@@ -1104,7 +1105,6 @@
int error;
NET *net= &thd->net;
Security_context *sctx= thd->security_ctx;
- thd->thread_stack= (char*) &thd;
net->no_send_error= 0;
if ((error=check_connection(thd)))
@@ -1195,6 +1195,7 @@
char *buff;
/* The following must be called before DBUG_ENTER */
+ thd->thread_stack= (char*) &thd;
if (my_thread_init() || thd->store_globals())
{
#ifndef EMBEDDED_LIBRARY
@@ -5286,6 +5287,7 @@
char *buf __attribute__((unused)))
{
long stack_used;
+ DBUG_ASSERT(thd == current_thd);
if ((stack_used=used_stack(thd->thread_stack,(char*) &stack_used)) >=
(long) (thread_stack - margin))
{
@@ -6735,7 +6737,10 @@
allocate temporary THD for execution of acl_reload()/grant_reload().
*/
if (!thd && (thd= (tmp_thd= new THD)))
+ {
+ thd->thread_stack= (char*) &tmp_thd;
thd->store_globals();
+ }
if (thd)
{
(void)acl_reload(thd);
--- 1.57/sql/sql_udf.cc 2005-11-07 18:14:56 +02:00
+++ 1.58/sql/sql_udf.cc 2005-11-24 02:38:33 +02:00
@@ -133,6 +133,7 @@
DBUG_VOID_RETURN;
}
initialized = 1;
+ new_thd->thread_stack= (char*) &new_thd;
new_thd->store_globals();
new_thd->db= my_strdup("mysql", MYF(0));
new_thd->db_length=5;
--- 1.43/sql/unireg.h 2005-11-07 18:14:57 +02:00
+++ 1.44/sql/unireg.h 2005-11-24 02:38:33 +02:00
@@ -46,8 +46,8 @@
#define ERRMAPP 1 /* Errormap f|r my_error */
#define LIBLEN FN_REFLEN-FN_LEN /* Max l{ngd p} dev */
-#define MAX_DBKEY_LENGTH (FN_LEN*2+1+1+4+4) /* extra 4+4 bytes for slave tmp
- * tables */
+/* extra 4+4 bytes for slave tmp tables */
+#define MAX_DBKEY_LENGTH (NAME_LEN*2+1+1+4+4)
#define MAX_ALIAS_NAME 256
#define MAX_FIELD_NAME 34 /* Max colum name length +2 */
#define MAX_SYS_VAR_LENGTH 32
--- 1.55/sql/share/errmsg.txt 2005-11-23 14:56:50 +02:00
+++ 1.56/sql/share/errmsg.txt 2005-11-24 02:56:09 +02:00
@@ -132,7 +132,7 @@
est "Ei suuda luua andmebaasi '%-.64s': andmebaas juba eksisteerib"
- ger "Kann Datenbank '%-.64s' nicht erzeugen. Datenbank '%-.64s' existiert bereits"
+ ger "Kann Datenbank '%-.64s' nicht erzeugen. Datenbank existiert bereits"
hun "Az '%-.64s' adatbazis nem hozhato letre Az adatbazis mar letezik"
ita "Impossibile creare il database '%-.64s'; il database esiste"
@@ -157,7 +157,7 @@
est "Ei suuda kustutada andmebaasi '%-.64s': andmebaasi ei eksisteeri"
fre "Ne peut effacer la base '%-.64s'; elle n'existe pas"
hun "A(z) '%-.64s' adatbazis nem szuntetheto meg. Az adatbazis nem letezik"
ita "Impossibile cancellare '%-.64s'; il database non esiste"
@@ -182,7 +182,7 @@
est "Viga andmebaasi kustutamisel (ei suuda kustutada faili '%-.64s', veakood: %d)"
fre "Ne peut effacer la base '%-.64s' (erreur %d)"
hun "Adatbazis megszuntetesi hiba ('%-.64s' nem torolheto, hibakod: %d)"
ita "Errore durante la cancellazione del database (impossibile cancellare '%-.64s', errno: %d)"
@@ -207,7 +207,7 @@
est "Viga andmebaasi kustutamisel (ei suuda kustutada kataloogi '%-.64s', veakood: %d)"
hun "Adatbazis megszuntetesi hiba ('%-.64s' nem szuntetheto meg, hibakod: %d)"
ita "Errore durante la cancellazione del database (impossibile rmdir '%-.64s', errno: %d)"
@@ -357,7 +357,7 @@
est "Ei suuda avada faili '%-.64s' (veakood: %d)"
fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
hun "A '%-.64s' file nem nyithato meg (hibakod: %d)"
ita "Impossibile aprire il file: '%-.64s' (errno: %d)"
@@ -702,7 +702,7 @@
eng "Got error %d from storage engine"
est "Tabeli handler tagastas vea %d"
- ger "Fehler %d (Tabellenhandler)"
+ ger "Fehler %d (Speicher-Engine)"
hun "%d hibajelzes a tablakezelotol"
ita "Rilevato l'errore %d dal gestore delle tabelle"
@@ -726,7 +726,7 @@
eng "Table storage engine for '%-.64s' doesn't have this option"
est "Tabeli '%-.64s' handler ei toeta antud operatsiooni"
fre "Le handler de la table '%-.64s' n'a pas cette option"
- ger "Diese Option gibt es nicht (Tabellenhandler)"
hun "A(z) '%-.64s' tablakezelonek nincs ilyen opcioja"
ita "Il gestore delle tabelle per '%-.64s' non ha questa opzione"
@@ -751,7 +751,7 @@
est "Ei suuda leida kirjet '%-.64s'-s"
fre "Ne peut trouver l'enregistrement dans '%-.64s'"
- ger "Kann Datensatz nicht finden"
+ ger "Kann Datensatz in '%-.64s' nicht finden"
hun "Nem talalhato a rekord '%-.64s'-ben"
ita "Impossibile trovare il record in '%-.64s'"
@@ -801,7 +801,7 @@
hun "Ervenytelen kulcsfile a tablahoz: '%-.64s'; probalja kijavitani!"
ita "File chiave errato per la tabella : '%-.64s'; prova a riparalo"
@@ -826,7 +826,7 @@
hun "Regi kulcsfile a '%-.64s'tablahoz; probalja kijavitani!"
ita "File chiave vecchio per la tabella '%-.64s'; riparalo!"
@@ -851,7 +851,7 @@
est "Tabel '%-.64s' on ainult lugemiseks"
fre "'%-.64s' est en lecture seulement"
- ger "'%-.64s' ist nur lesbar"
+ ger "Tabelle '%-.64s' ist nur lesbar"
hun "'%-.64s' irasvedett"
ita "'%-.64s' e` di sola lettura"
@@ -901,7 +901,7 @@
hun "Nincs eleg memoria a rendezeshez. Novelje a rendezo demon puffermeretet"
ita "Memoria per gli ordinamenti esaurita. Incrementare il 'sort_buffer' al demone"
@@ -976,7 +976,7 @@
hun "Elfogyott a thread-memoria"
ita "Fine dello spazio/memoria per i thread"
@@ -1025,7 +1025,7 @@
eng "Bad handshake"
fre "Mauvais 'handshake'"
- ger "Schlechter Handshake"
hun "A kapcsolatfelvetel nem sikerult (Bad handshake)"
ita "Negoziazione impossibile"
@@ -1245,7 +1245,7 @@
eng "Column '%-.64s' in %-.64s is ambiguous"
fre "Champ: '%-.64s' dans %s est ambigu"
- ger "Spalte '%-.64s' in %-.64s ist nicht eindeutig"
+ ger "Feld '%-.64s' in %-.64s ist nicht eindeutig"
hun "A(z) '%-.64s' oszlop %-.64s-ben ketertelmu"
ita "Colonna: '%-.64s' di %-.64s e` ambigua"
@@ -1411,7 +1411,7 @@
est "Identifikaatori '%-.100s' nimi on liiga pikk"
fre "Le nom de l'identificateur '%-.64s' est trop long"
- ger "Name des Bezeichners '%-.64s' ist zu lang"
+ ger "Name des Bezeichners '%-.100s' ist zu lang"
hun "A(z) '%-.100s' azonositonev tul hosszu."
ita "Il nome dell'identificatore '%-.100s' e` troppo lungo"
@@ -1436,7 +1436,7 @@
est "Kattuv tulba nimi '%-.64s'"
- ger "Doppelter Spaltenname vorhanden: '%-.64s'"
+ ger "Doppelter Spaltenname: '%-.64s'"
hun "Duplikalt oszlopazonosito: '%-.64s'"
ita "Nome colonna duplicato '%-.64s'"
@@ -1461,7 +1461,7 @@
hun "Duplikalt kulcsazonosito: '%-.64s'"
ita "Nome chiave duplicato '%-.64s'"
@@ -1510,7 +1510,7 @@
eng "Incorrect column specifier for column '%-.64s'"
est "Vigane tulba kirjeldus tulbale '%-.64s'"
hun "Rossz oszlopazonosito: '%-.64s'"
ita "Specifica errata per la colonna '%-.64s'"
@@ -1608,7 +1608,7 @@
eng "Invalid default value for '%-.64s'"
- ger "Fehlerhafter Vorgabewert (DEFAULT): '%-.64s'"
hun "Ervenytelen ertek: '%-.64s'"
ita "Valore di default non valido per '%-.64s'"
@@ -1632,7 +1632,7 @@
hun "Tobbszoros elsodleges kulcs definialas."
ita "Definite piu` chiave primarie"
@@ -1681,7 +1681,7 @@
eng "Too many key parts specified; max %d parts allowed"
hun "Tul sok kulcsdarabot definialt. Maximum %d resz engedelyezett"
ita "Troppe parti di chiave specificate. Sono ammesse max %d parti"
@@ -1730,7 +1730,7 @@
hun "A(z) '%-.64s'kulcsoszlop nem letezik a tablaban"
ita "La colonna chiave '%-.64s' non esiste nella tabella"
@@ -1778,7 +1778,7 @@
fre "Champ '%-.64s' trop long (max = %d). Utilisez un BLOB"
hun "A(z) '%-.64s' oszlop tul hosszu. (maximum = %d). Hasznaljon BLOB tipust inkabb."
ita "La colonna '%-.64s' e` troppo grande (max=%d). Utilizza un BLOB."
@@ -1803,7 +1803,7 @@
hun "Csak egy auto mezo lehetseges, es azt kulcskent kell definialni."
ita "Puo` esserci solo un campo AUTO e deve essere definito come chiave"
@@ -1828,7 +1828,7 @@
hun "%s: kapcsolatra kesz"
ita "%s: Pronto per le connessioni\n"
@@ -1901,7 +1901,7 @@
- ger "%-.64s: Heruntergefahren (shutdown)\n"
+ ger "%-.64s: Herunterfahren beendet\n"
hun "%s: A leallitas kesz\n"
ita "%s: Shutdown completato\n"
@@ -1976,7 +1976,7 @@
- ger "Tabelle '%-.64s' besitzt keinen wie den in CREATE INDEX verwendeten Index. Index neu anlegen"
+ ger "Tabelle '%-.64s' besitzt keinen wie den in CREATE INDEX verwendeten Index. Tabelle neu anlegen"
hun "A(z) '%-.64s' tablahoz nincs meg a CREATE INDEX altal hasznalt index. Alakitsa at a tablat"
ita "La tabella '%-.64s' non ha nessun indice come quello specificatato dalla CREATE INDEX. Ricrea la tabella"
@@ -2048,7 +2048,7 @@
hun "A(z) '%-.64s'-nak az adatbazis konyvtarban kell lennie, vagy mindenki szamara olvashatonak"
ita "Il file '%-.64s' deve essere nella directory del database e deve essere leggibile da tutti"
@@ -2073,7 +2073,7 @@
est "Fail '%-.80s' juba eksisteerib"
- ger "Datei '%-.64s' bereits vorhanden"
+ ger "Datei '%-.80s' bereits vorhanden"
hun "A '%-.64s' file mar letezik."
ita "Il file '%-.64s' esiste gia`"
@@ -2147,7 +2147,7 @@
eng "Incorrect sub part key; the used key part isn't a string, the used length is longer than the key part, or the storage engine doesn't support unique sub keys"
hun "Rossz alkulcs. A hasznalt kulcsresz nem karaktersorozat vagy hosszabb, mint a kulcsresz"
ita "Sotto-parte della chiave errata. La parte di chiave utilizzata non e` una stringa o la lunghezza e` maggiore della parte di chiave."
@@ -2197,7 +2197,7 @@
hun "A DROP '%-.64s' nem lehetseges. Ellenorizze, hogy a mezo/kulcs letezik-e"
ita "Impossibile cancellare '%-.64s'. Controllare che il campo chiave esista"
@@ -2325,7 +2325,7 @@
eng "Too many strings for column %-.64s and SET"
hun "Tul sok karakter: %-.64s es SET"
ita "Troppe stringhe per la colonna %-.64s e la SET"
@@ -2348,7 +2348,7 @@
eng "Can't generate a unique log-filename %-.64s.(1-999)\n"
est "Ei suuda luua unikaalset logifaili nime %-.64s.(1-999)\n"
hun "Egyedi log-filenev nem generalhato: %-.64s.(1-999)\n"
ita "Impossibile generare un nome del file log unico %-.64s.(1-999)\n"
@@ -2421,7 +2421,7 @@
eng "BLOB/TEXT column '%-.64s' can't have a default value"
- ger "BLOB-Feld '%-.64s' darf keinen Vorgabewert (DEFAULT) haben"
+ ger "BLOB/TEXT-Feld '%-.64s' darf keinen Vorgabewert (DEFAULT) haben"
hun "A(z) '%-.64s' blob objektumnak nem lehet alapertelmezett erteke"
ita "Il campo BLOB '%-.64s' non puo` avere un valore di default"
@@ -2446,7 +2446,7 @@
est "Vigane andmebaasi nimi '%-.100s'"
- ger "Unerlaubter Datenbankname '%-.64s'"
+ ger "Unerlaubter Datenbankname '%-.100s'"
hun "Hibas adatbazisnev: '%-.100s'"
ita "Nome database errato '%-.100s'"
@@ -2471,7 +2471,7 @@
est "Vigane tabeli nimi '%-.100s'"
- ger "Unerlaubter Tabellenname '%-.64s'"
+ ger "Unerlaubter Tabellenname '%-.100s'"
hun "Hibas tablanev: '%-.100s'"
ita "Nome tabella errato '%-.100s'"
@@ -2495,7 +2495,7 @@
eng "The SELECT would examine more than MAX_JOIN_SIZE rows; check your WHERE and use SET SQL_BIG_SELECTS=1 or SET SQL_MAX_JOIN_SIZE=# if the SELECT is okay"
hun "A SELECT tul sok rekordot fog megvizsgalni es nagyon sokaig fog tartani. Ellenorizze a WHERE-t es hasznalja a SET SQL_BIG_SELECTS=1 beallitast, ha a SELECT okay"
ita "La SELECT dovrebbe esaminare troppi record e usare troppo tempo. Controllare la WHERE e usa SET SQL_BIG_SELECTS=1 se e` tutto a posto."
@@ -2676,7 +2676,7 @@
eng "Table '%-.64s' uses an extension that doesn't exist in this MySQL version"
est "Tabel '%-.64s' kasutab laiendust, mis ei eksisteeri antud MySQL versioonis"
fre "Table '%-.64s' : utilise une extension invalide pour cette version de MySQL"
hun "A(z) '%-.64s' tabla olyan bovitest hasznal, amely nem letezik ebben a MySQL versioban."
ita "La tabella '%-.64s' usa un'estensione che non esiste in questa versione di MySQL"
@@ -2700,7 +2700,7 @@
fre "Une table doit comporter au moins une colonne"
+ ger "Eine Tabelle muss mindestens eine Spalte besitzen"
hun "A tablanak legalabb egy oszlopot tartalmazni kell"
ita "Una tabella deve avere almeno 1 colonna"
@@ -2788,7 +2788,7 @@
est "Liiga palju tulpasid"
fre "Trop de champs"
- ger "Zu viele Spalten"
+ ger "Zu viele Felder"
hun "Tul sok mezo"
ita "Troppi campi"
@@ -2810,7 +2810,7 @@
fre "Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB"
hun "Tul nagy sormeret. A maximalis sormeret (nem szamolva a blob objektumokat) %d. Nehany mezot meg kell valtoztatnia"
ita "Riga troppo grande. La massima grandezza di una riga, non contando i BLOB, e` %d. Devi cambiare alcuni campi in BLOB"
@@ -2831,7 +2831,7 @@
eng "Thread stack overrun: Used: %ld of a %ld stack. Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed"
hun "Thread verem tullepes: Used: %ld of a %ld stack. Hasznalja a 'mysqld -O thread_stack=#' nagyobb verem definialasahoz"
ita "Thread stack overrun: Usati: %ld di uno stack di %ld. Usa 'mysqld -O thread_stack=#' per specificare uno stack piu` grande."
@@ -3003,15 +3003,15 @@
ER_CANT_FIND_DL_ENTRY
- dan "Kan ikke finde funktionen '%-.64s' i bibliotek'"
+ dan "Kan ikke finde funktionen '%-.64s' i bibliotek"
nla "Kan functie '%-.64s' niet in library vinden"
- eng "Can't find symbol '%-.64s' in library'"
+ eng "Can't find symbol '%-.64s' in library"
est "Ei leia funktsiooni '%-.64s' antud teegis"
ger "Kann Funktion '%-.64s' in der Library nicht finden"
hun "A(z) '%-.64s' fuggveny nem talalhato a konyvtarban"
ita "Impossibile trovare la funzione '%-.64s' nella libreria"
@@ -3020,10 +3020,10 @@
rum "Nu pot gasi functia '%-.64s' in libraria"
serbian "Ne mogu da pronadjem funkciju '%-.64s' u biblioteci"
swe "Hittar inte funktionen '%-.64s' in det dynamiska biblioteket"
ER_FUNCTION_NOT_DEFINED
dan "Funktionen '%-.64s' er ikke defineret"
@@ -3198,7 +3198,7 @@
nla "Kolom aantal komt niet overeen met waarde aantal in rij %ld"
eng "Column count doesn't match value count at row %ld"
hun "Az oszlopban talalhato ertek nem egyezik meg a %ld sorban szamitott ertekkel"
ita "Il numero delle colonne non corrisponde al conteggio alla riga %ld"
@@ -3276,7 +3276,7 @@
eng "Mixing of GROUP columns (MIN(),MAX(),COUNT(),...) with no GROUP columns is illegal if there is no GROUP BY clause"
est "GROUP tulpade (MIN(),MAX(),COUNT()...) kooskasutamine tavaliste tulpadega ilma GROUP BY klauslita ei ole lubatud"
hun "A GROUP mezok (MIN(),MAX(),COUNT()...) kevert hasznalata nem lehetseges GROUP BY hivatkozas nelkul"
ita "Il mescolare funzioni di aggregazione (MIN(),MAX(),COUNT()...) e non e` illegale se non c'e` una clausula GROUP BY"
@@ -3315,7 +3315,7 @@
hun "%-.16s parancs a '%-.32s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.64s' tablaban"
ita "Comando %-.16s negato per l'utente: '%-.32s'@'%-.64s' sulla tabella '%-.64s'"
@@ -3335,7 +3335,7 @@
hun "%-.16s parancs a '%-.32s'@'%-.64s' felhasznalo szamara nem engedelyezett a '%-.64s' mezo eseten a '%-.64s' tablaban"
ita "Comando %-.16s negato per l'utente: '%-.32s'@'%-.64s' sulla colonna '%-.64s' della tabella '%-.64s'"
@@ -3419,7 +3419,7 @@
eng "There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'"
hun "A '%-.32s' felhasznalo szamara a '%-.64s' host '%-.64s' tablajaban ez a parancs nem engedelyezett"
ita "GRANT non definita per l'utente '%-.32s' dalla macchina '%-.64s' sulla tabella '%-.64s'"
@@ -3455,7 +3455,7 @@
eng "You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use"
fre "Erreur de syntaxe"
+ ger "Fehler in der SQL-Syntax. Bitte die korrekte Syntax im Handbuch nachschlagen"
greek "You have an error in your SQL syntax"
hun "Szintaktikai hiba"
ita "Errore di sintassi nella query SQL"
@@ -3538,7 +3538,7 @@
eng "Got a packet bigger than 'max_allowed_packet' bytes"
est "Saabus suurem pakett kui lubatud 'max_allowed_packet' muutujaga"
hun "A kapott csomag nagyobb, mint a maximalisan engedelyezett: 'max_allowed_packet'"
ita "Ricevuto un pacchetto piu` grande di 'max_allowed_packet'"
@@ -3556,7 +3556,7 @@
eng "Got a read error from the connection pipe"
- ger "Lese-Fehler bei einer Kommunikations-Pipe"
+ ger "Lese-Fehler bei einer Verbindungs-Pipe"
hun "Olvasasi hiba a kapcsolat soran"
ita "Rilevato un errore di lettura dalla pipe di connessione"
@@ -3700,7 +3700,7 @@
eng "Result string is longer than 'max_allowed_packet' bytes"
est "Tulemus on pikem kui lubatud 'max_allowed_packet' muutujaga"
hun "Ez eredmeny sztring nagyobb, mint a lehetseges maximum: 'max_allowed_packet'"
ita "La stringa di risposta e` piu` lunga di 'max_allowed_packet'"
@@ -3717,7 +3717,7 @@
eng "The used table type doesn't support BLOB/TEXT columns"
fre "Ce type de table ne supporte pas les colonnes BLOB/TEXT"
hun "A hasznalt tabla tipus nem tamogatja a BLOB/TEXT mezoket"
ita "Il tipo di tabella usata non supporta colonne di tipo BLOB/TEXT"
@@ -3734,7 +3734,7 @@
eng "The used table type doesn't support AUTO_INCREMENT columns"
fre "Ce type de table ne supporte pas les colonnes AUTO_INCREMENT"
hun "A hasznalt tabla tipus nem tamogatja az AUTO_INCREMENT tipusu mezoket"
ita "Il tipo di tabella usata non supporta colonne di tipo AUTO_INCREMENT"
@@ -3751,7 +3751,7 @@
eng "INSERT DELAYED can't be used with table '%-.64s' because it is locked with LOCK TABLES"
- ger "INSERT DELAYED kann nicht auf Tabelle '%-.64s' angewendet werden, da diese mit LOCK TABLES gesperrt ist"
greek "INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES"
hun "Az INSERT DELAYED nem hasznalhato a '%-.64s' tablahoz, mert a tabla zarolt (LOCK TABLES)"
ita "L'inserimento ritardato (INSERT DELAYED) non puo` essere usato con la tabella '%-.64s', perche` soggetta a lock da 'LOCK TABLES'"
@@ -3792,7 +3792,7 @@
eng "The used storage engine can't index column '%-.64s'"
est "Tabelihandler ei oska indekseerida tulpa '%-.64s'"
- ger "Der verwendete Tabellen-Handler kann die Spalte '%-.64s' nicht indizieren"
+ ger "Die verwendete Speicher-Engine kann die Spalte '%-.64s' nicht indizieren"
greek "The used table handler can't index column '%-.64s'"
hun "A hasznalt tablakezelo nem tudja a '%-.64s' mezot indexelni"
ita "Il gestore delle tabelle non puo` indicizzare la colonna '%-.64s'"
@@ -3839,7 +3839,7 @@
eng "Can't write, because of unique constraint, to table '%-.64s'"
hun "A '%-.64s' nem irhato, az egyedi mezok miatt"
ita "Impossibile scrivere nella tabella '%-.64s' per limitazione di unicita`"
@@ -3880,7 +3880,7 @@
eng "All parts of a PRIMARY KEY must be NOT NULL; if you need NULL in a key, use UNIQUE instead"
hun "Az elsodleges kulcs teljes egeszeben csak NOT NULL tipusu lehet; Ha NULL mezot szeretne a kulcskent, hasznalja inkabb a UNIQUE-ot"
ita "Tutte le parti di una chiave primaria devono essere dichiarate NOT NULL; se necessitano valori NULL nelle chiavi utilizzare UNIQUE"
@@ -3914,7 +3914,7 @@
eng "This table type requires a primary key"
hun "Az adott tablatipushoz elsodleges kulcs hasznalata kotelezo"
ita "Questo tipo di tabella richiede una chiave primaria"
@@ -3948,7 +3948,7 @@
eng "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column"
est "Katse muuta tabelit turvalises rezhiimis ilma WHERE klauslita"
hun "On a biztonsagos update modot hasznalja, es WHERE that uses a KEY column"
ita "In modalita` 'safe update' si e` cercato di aggiornare una tabella senza clausola WHERE su una chiave"
@@ -4100,7 +4100,7 @@
eng "Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: '%-.64s' (%-.64s)"
- ger "Verbindungsabbruch %ld zur Datenbank '%-.64s'. Benutzer: '%-.32s', Host: '%-.64s' (%-.64s)"
+ ger "Abbruch der Verbindung %ld zur Datenbank '%-.64s'. Benutzer: '%-.32s', Host: '%-.64s' (%-.64s)"
ita "Interrotta la connessione %ld al db: ''%-.64s' utente: '%-.32s' host: '%-.64s' (%-.64s)"
@@ -4137,7 +4137,7 @@
nla "Gefaald tijdens heropbouw index van gedumpte tabel '%-.64s'"
eng "Failed rebuilding the index of dumped table '%-.64s'"
- ger "Neuerstellung des Indizes der Dump-Tabelle '%-.64s' fehlgeschlagen"
+ ger "Neuerstellung des Index der Dump-Tabelle '%-.64s' fehlgeschlagen"
greek "Failed rebuilding the index of dumped table '%-.64s'"
hun "Failed rebuilding the index of dumped table '%-.64s'"
ita "Fallita la ricostruzione dell'indice della tabella copiata '%-.64s'"
@@ -4195,7 +4195,7 @@
eng "Can't find FULLTEXT index matching the column list"
est "Ei suutnud leida FULLTEXT indeksit, mis kattuks kasutatud tulpadega"
- ger "Kann keinen FULLTEXT-Index finden, der der Spaltenliste entspricht"
+ ger "Kann keinen FULLTEXT-Index finden, der der Feldliste entspricht"
ita "Impossibile trovare un indice FULLTEXT che corrisponda all'elenco delle colonne"
@@ -4283,7 +4283,7 @@
eng "Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage; increase this mysqld variable and try again"
ita "La transazione a comandi multipli (multi-statement) ha richiesto piu` di 'max_binlog_cache_size' bytes di disco: aumentare questa variabile di mysqld e riprovare"
@@ -4295,7 +4295,7 @@
nla "Deze operatie kan niet worden uitgevoerd met een actieve slave, doe eerst STOP SLAVE"
eng "This operation cannot be performed with a running slave; run STOP SLAVE first"
ita "Questa operazione non puo' essere eseguita con un database 'slave' che gira, lanciare prima STOP SLAVE"
@@ -4332,6 +4332,7 @@
ER_MASTER_INFO
eng "Could not initialize master info structure; more error messages can be found in the MySQL error log"
serbian "Nisam mogao da inicijalizujem informacionu strukturu glavnog servera, proverite da li imam privilegije potrebne za pristup file-u 'master.info'"
ER_SLAVE_THREAD
@@ -4339,7 +4340,7 @@
nla "Kon slave thread niet aanmaken, controleer systeem resources"
eng "Could not create slave thread; check system resources"
ita "Impossibile creare il thread 'slave', controllare le risorse di sistema"
@@ -4353,7 +4354,7 @@
eng "User %-.64s already has more than 'max_user_connections' active connections"
- ger "Benutzer '%-.64s' hat mehr als max_user_connections aktive Verbindungen"
+ ger "Benutzer '%-.64s' hat mehr als 'max_user_connections' aktive Verbindungen"
ita "L'utente %-.64s ha gia' piu' di 'max_user_connections' connessioni attive"
@@ -4409,7 +4410,7 @@
eng "Update locks cannot be acquired during a READ UNCOMMITTED transaction"
ita "I lock di aggiornamento non possono essere acquisiti durante una transazione 'READ UNCOMMITTED'"
@@ -4463,7 +4464,7 @@
eng "'%-.32s'@'%-.64s' is not allowed to create new users"
est "Kasutajal '%-.32s'@'%-.64s' ei ole lubatud luua uusi kasutajaid"
ita "A '%-.32s'@'%-.64s' non e' permesso creare nuovi utenti"
@@ -4488,7 +4489,7 @@
eng "Deadlock found when trying to get lock; try restarting transaction"
est "Lukustamisel tekkis tupik (deadlock); alusta transaktsiooni otsast"
- ger "Beim Versuch, eine Sperre anzufordern, ist ein Deadlock aufgetreten. Versuchen Sie, die Transaktion erneut zu starten"
+ ger "Beim Versuch, eine Sperre anzufordern, ist ein Deadlock aufgetreten. Versuchen Sie, die Transaktion neu zu starten"
ita "Trovato deadlock durante il lock; Provare a far ripartire la transazione"
@@ -4512,7 +4513,7 @@
nla "Kan foreign key beperking niet toevoegen"
eng "Cannot add foreign key constraint"
fre "Impossible d'ajouter des contraintes d'index externe"
ita "Impossibile aggiungere il vincolo di integrita' referenziale (foreign key constraint)"
@@ -4523,7 +4524,7 @@
nla "Kan onderliggende rij niet toevoegen: foreign key beperking gefaald"
eng "Cannot add or update a child row: a foreign key constraint fails"
greek "Cannot add a child row: a foreign key constraint fails"
hun "Cannot add a child row: a foreign key constraint fails"
ita "Impossibile aggiungere la riga: un vincolo d'integrita' referenziale non e' soddisfatto"
@@ -4535,7 +4536,7 @@
ER_ROW_IS_REFERENCED 23000
eng "Cannot delete or update a parent row: a foreign key constraint fails"
greek "Cannot delete a parent row: a foreign key constraint fails"
hun "Cannot delete a parent row: a foreign key constraint fails"
ita "Impossibile cancellare la riga: un vincolo d'integrita' referenziale non e' soddisfatto"
@@ -4589,7 +4590,7 @@
nla "De gebruikte SELECT commando's hebben een verschillend aantal kolommen"
eng "The used SELECT statements have a different number of columns"
est "Tulpade arv kasutatud SELECT lausetes ei kattu"
ita "La SELECT utilizzata ha un numero di colonne differente"
@@ -4600,7 +4601,7 @@
nla "Kan de query niet uitvoeren vanwege een conflicterende read lock"
eng "Can't execute the query because you have a conflicting read lock"
ita "Impossibile eseguire la query perche' c'e' un conflitto con in lock di lettura"
@@ -4640,7 +4641,7 @@
ER_SPECIFIC_ACCESS_DENIED_ERROR 42000
nla "Toegang geweigerd. U moet het %-.128s privilege hebben voor deze operatie"
eng "Access denied; you need the %-.128s privilege for this operation"
ita "Accesso non consentito. Serve il privilegio %-.128s per questa operazione"
@@ -4722,7 +4723,7 @@
ER_MASTER_FATAL_ERROR_READING_BINLOG
nla "Kreeg fatale fout %d: '%-.128s' van master tijdens lezen van data uit binaire log"
eng "Got fatal error %d: '%-.128s' from master when reading data from binary log"
ita "Errore fatale %d: '%-.128s' dal master leggendo i dati dal log binario"
por "Obteve fatal erro %d: '%-.128s' do master quando lendo dados do binary log"
@@ -4737,11 +4738,12 @@
ER_INCORRECT_GLOBAL_LOCAL_VAR
eng "Variable '%-.64s' is a %s variable"
serbian "Incorrect foreign key definition for '%-.64s': %s"
+ ger "Variable '%-.64s' ist eine %s-Variable"
spa "Variable '%-.64s' es una %s variable"
ER_WRONG_FK_DEF 42000
eng "Incorrect foreign key definition for '%-.64s': %s"
@@ -4753,7 +4755,7 @@
ER_OPERAND_COLUMNS 21000
eng "Operand should contain %d column(s)"
- ger "Operand solle %d Spalte(n) enthalten"
+ ger "Operand sollte %d Spalte(n) enthalten"
spa "Operando debe tener %d columna(s)"
@@ -4789,7 +4791,7 @@
ER_AUTO_CONVERT
eng "Converting column '%s' from %s to %s"
- ger "Spalte '%s' wird von %s nach %s umgewandelt"
+ ger "Feld '%s' wird von %s nach %s umgewandelt"
por "Convertendo coluna '%s' de %s para %s"
spa "Convirtiendo columna '%s' de %s para %s"
@@ -4831,7 +4833,7 @@
ER_SPATIAL_CANT_HAVE_NULL 42000
eng "All parts of a SPATIAL index must be NOT NULL"
por "Todas as partes de uma SPATIAL index devem ser NOT NULL"
spa "Todas las partes de una SPATIAL index deben ser NOT NULL"
@@ -4855,12 +4857,12 @@
swe "Slaven har redan stoppat"
ER_TOO_BIG_FOR_UNCOMPRESS
eng "Uncompressed data size too large; the maximum size is %d (probably, length of uncompressed data was corrupted)"
ER_ZLIB_Z_MEM_ERROR
eng "ZLIB: Not enough memory"
+ ger "ZLIB: Nicht genug Speicher"
spa "Z_MEM_ERROR: No suficiente memoria para zlib"
ER_ZLIB_Z_BUF_ERROR
@@ -4882,27 +4884,27 @@
ukr "%d line(s) was(were) cut by group_concat()"
ER_WARN_TOO_FEW_RECORDS 01000
eng "Row %ld doesn't contain data for all columns"
ER_WARN_TOO_MANY_RECORDS 01000
eng "Row %ld was truncated; it contained more data than there were input columns"
ER_WARN_NULL_TO_NOTNULL 22004
eng "Column set to default value; NULL supplied to NOT NULL column '%s' at row %ld"
por "Dado truncado, NULL fornecido para NOT NULL coluna '%s' na linha %ld"
ER_WARN_DATA_OUT_OF_RANGE 22003
eng "Out of range value adjusted for column '%s' at row %ld"
por "Dado truncado, fora de alcance para coluna '%s' na linha %ld"
WARN_DATA_TRUNCATED 01000
eng "Data truncated for column '%s' at row %ld"
por "Dado truncado para coluna '%s' na linha %ld"
ER_WARN_USING_OTHER_HANDLER
@@ -4913,40 +4915,40 @@
ER_CANT_AGGREGATE_2COLLATIONS
eng "Illegal mix of collations (%s,%s) and (%s,%s) for operation '%s'"
ER_DROP_USER
eng "Cannot drop one or more of the requested users"
ER_REVOKE_GRANTS
- eng "Can't revoke all privileges, grant for one or more of the requested users"
- ger "Kann nicht alle Berechtigungen widerrufen, grant for one or more of the requested users"
+ eng "Can't revoke all privileges for one or more of the requested users"
spa "No puede revocar todos los privilegios, derecho para uno o mas de los usuarios solicitados"
ER_CANT_AGGREGATE_3COLLATIONS
eng "Illegal mix of collations (%s,%s), (%s,%s), (%s,%s) for operation '%s'"
ER_CANT_AGGREGATE_NCOLLATIONS
eng "Illegal mix of collations for operation '%s'"
ER_VARIABLE_IS_NOT_STRUCT
eng "Variable '%-.64s' is not a variable component (can't be used as XXXX.variable_name)"
- ger "Variable '%-.64s' ist keine Variablen-Komponenten (kann nicht als XXXX.variablen_name verwendet werden)"
+ ger "Variable '%-.64s' ist keine Variablen-Komponente (kann nicht als XXXX.variablen_name verwendet werden)"
spa "Variable '%-.64s' no es una variable componente (No puede ser usada como XXXX.variable_name)"
ER_UNKNOWN_COLLATION
eng "Unknown collation: '%-.64s'"
- ger "Unbekannte Kollation: '%-.64s'"
+ ger "Unbekannte Sortierreihenfolge: '%-.64s'"
por "Collation desconhecida: '%-.64s'"
spa "Collation desconocida: '%-.64s'"
ER_SLAVE_IGNORED_SSL_PARAMS
eng "SSL parameters in CHANGE MASTER are ignored because this MySQL slave was compiled without SSL support; they can be used later if MySQL slave with SSL is started"
spa "Parametros SSL en CHANGE MASTER son ignorados porque este slave MySQL fue compilado sin soporte SSL; pueden ser usados despues cuando el slave MySQL con SSL sea inicializado"
ER_SERVER_IS_IN_SECURE_AUTH_MODE
@@ -4969,7 +4971,7 @@
ER_MISSING_SKIP_SLAVE
eng "It is recommended to use --skip-slave-start when doing step-by-step replication with START SLAVE UNTIL; otherwise, you will get problems if you get an unexpected slave's mysqld restart"
ER_UNTIL_COND_IGNORED
@@ -4979,16 +4981,19 @@
spa "SQL thread no es inicializado tal que opciones UNTIL son ignoradas"
ER_WRONG_NAME_FOR_INDEX 42000
eng "Incorrect index name '%-.100s'"
+ ger "Falscher Indexname '%-.100s'"
swe "Felaktigt index namn '%-.100s'"
ER_WRONG_NAME_FOR_CATALOG 42000
eng "Incorrect catalog name '%-.100s'"
+ ger "Falscher Katalogname '%-.100s'"
spa "Nombre de catalog incorrecto '%-.100s'"
swe "Felaktigt katalog namn '%-.100s'"
ER_WARN_QC_RESIZE
eng "Query cache failed to set size %lu; new query cache size is %lu"
@@ -4996,28 +5001,34 @@
ER_BAD_FT_COLUMN
eng "Column '%-.64s' cannot be part of FULLTEXT index"
+ ger "Feld '%-.64s' kann nicht Teil eines FULLTEXT-Index sein"
spa "Columna '%-.64s' no puede ser parte de FULLTEXT index"
swe "Kolumn '%-.64s' kan inte vara del av ett FULLTEXT index"
ER_UNKNOWN_KEY_CACHE
eng "Unknown key cache '%-.100s'"
por "Key cache desconhecida '%-.100s'"
spa "Desconocida key cache '%-.100s'"
ER_WARN_HOSTNAME_WONT_WORK
eng "MySQL is started in --skip-name-resolve mode; you must restart it without this switch for this grant to work"
ER_UNKNOWN_STORAGE_ENGINE 42000
eng "Unknown table engine '%s'"
+ ger "Unbekannte Speicher-Engine '%s'"
por "Motor de tabela desconhecido '%s'"
spa "Desconocido motor de tabla '%s'"
ER_WARN_DEPRECATED_SYNTAX
eng "'%s' is deprecated; use '%s' instead"
+ ger "'%s' ist veraltet. Bitte benutzen Sie '%s'"
ER_NON_UPDATABLE_TABLE
eng "The target table %-.100s of the %s is not updatable"
+ ger "Die Zieltabelle %-.100s von %s ist nicht aktualisierbar"
spa "La tabla destino %-.100s del %s no es actualizable"
@@ -5025,406 +5036,568 @@
ER_FEATURE_DISABLED
eng "The '%s' feature is disabled; you need MySQL built with '%s' to have it working"
spa "El recurso '%s' fue deshabilitado; usted necesita construir MySQL con '%s' para tener eso funcionando"
ER_OPTION_PREVENTS_STATEMENT
eng "The MySQL server is running with the %s option so it cannot execute this statement"
ER_DUPLICATED_VALUE_IN_TYPE
eng "Column '%-.100s' has duplicated value '%-.64s' in %s"
+ ger "Feld '%-.100s' hat doppelten Wert '%-.64s' in %s"
por "Coluna '%-.100s' tem valor duplicado '%-.64s' em %s"
spa "Columna '%-.100s' tiene valor doblado '%-.64s' en %s"
ER_TRUNCATED_WRONG_VALUE 22007
eng "Truncated incorrect %-.32s value: '%-.128s'"
por "Truncado errado %-.32s valor: '%-.128s'"
spa "Equivocado truncado %-.32s valor: '%-.128s'"
ER_TOO_MUCH_AUTO_TIMESTAMP_COLS
eng "Incorrect table definition; there can be only one TIMESTAMP column with CURRENT_TIMESTAMP in DEFAULT or ON UPDATE clause"
+ ger "Fehlerhafte Tabellendefinition. Es kann nur eine einzige TIMESTAMP-Spalte mit CURRENT_TIMESTAMP als DEFAULT oder in einer ON-UPDATE-Klausel geben"
ER_INVALID_ON_UPDATE
eng "Invalid ON UPDATE clause for '%-.64s' column"
ER_UNSUPPORTED_PS
eng "This command is not supported in the prepared statement protocol yet"
ER_GET_ERRMSG
dan "Modtog fejl %d '%-.100s' fra %s"
eng "Got error %d '%-.100s' from %s"
+ ger "Fehler %d '%-.100s' von %s"
nor "Mottok feil %d '%-.100s' fa %s"
norwegian-ny "Mottok feil %d '%-.100s' fra %s"
ER_GET_TEMPORARY_ERRMSG
dan "Modtog temporary fejl %d '%-.100s' fra %s"
eng "Got temporary error %d '%-.100s' from %s"
nor "Mottok temporary feil %d '%-.100s' fra %s"
norwegian-ny "Mottok temporary feil %d '%-.100s' fra %s"
ER_UNKNOWN_TIME_ZONE
eng "Unknown or incorrect time zone: '%-.64s'"
+ ger "Unbekannte oder falsche Zeitzone: '%-.64s'"
ER_WARN_INVALID_TIMESTAMP
eng "Invalid TIMESTAMP value in column '%s' at row %ld"
ER_INVALID_CHARACTER_STRING
eng "Invalid %s character string: '%.64s'"
ER_WARN_ALLOWED_PACKET_OVERFLOWED
eng "Result of %s() was larger than max_allowed_packet (%ld) - truncated"
ER_CONFLICTING_DECLARATIONS
eng "Conflicting declarations: '%s%s' and '%s%s'"
ER_SP_NO_RECURSIVE_CREATE 2F003
eng "Can't create a %s from within another stored routine"
+ ger "Kann kein %s innerhalb einer anderen gespeicherten Routine erzeugen"
ER_SP_ALREADY_EXISTS 42000
eng "%s %s already exists"
+ ger "%s %s existiert bereits"
ER_SP_DOES_NOT_EXIST 42000
eng "%s %s does not exist"
+ ger "%s %s existiert nicht"
ER_SP_DROP_FAILED
eng "Failed to DROP %s %s"
+ ger "DROP %s %s ist fehlgeschlagen"
ER_SP_STORE_FAILED
eng "Failed to CREATE %s %s"
+ ger "CREATE %s %s ist fehlgeschlagen"
ER_SP_LILABEL_MISMATCH 42000
eng "%s with no matching label: %s"
+ ger "%s ohne passende Marke: %s"
ER_SP_LABEL_REDEFINE 42000
eng "Redefining label %s"
+ ger "Neudefinition der Marke %s"
ER_SP_LABEL_MISMATCH 42000
eng "End-label %s without match"
ER_SP_UNINIT_VAR 01000
eng "Referring to uninitialized variable %s"
+ ger "Zugriff auf nichtinitialisierte Variable %s"
ER_SP_BADSELECT 0A000
eng "PROCEDURE %s can't return a result set in the given context"
ER_SP_BADRETURN 42000
eng "RETURN is only allowed in a FUNCTION"
+ ger "RETURN ist nur innerhalb einer FUNCTION erlaubt"
ER_SP_BADSTATEMENT 0A000
eng "%s is not allowed in stored procedures"
+ ger "%s ist in gespeicherten Prozeduren nicht erlaubt"
ER_UPDATE_LOG_DEPRECATED_IGNORED 42000
eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been ignored"
ER_UPDATE_LOG_DEPRECATED_TRANSLATED 42000
eng "The update log is deprecated and replaced by the binary log; SET SQL_LOG_UPDATE has been translated to SET SQL_LOG_BIN"
ER_QUERY_INTERRUPTED 70100
eng "Query execution was interrupted"
ER_SP_WRONG_NO_OF_ARGS 42000
eng "Incorrect number of arguments for %s %s; expected %u, got %u"
ER_SP_COND_MISMATCH 42000
eng "Undefined CONDITION: %s"
+ ger "Undefinierte CONDITION: %s"
ER_SP_NORETURN 42000
eng "No RETURN found in FUNCTION %s"
+ ger "Kein RETURN in FUNCTION %s gefunden"
ER_SP_NORETURNEND 2F005
eng "FUNCTION %s ended without RETURN"
+ ger "FUNCTION %s endete ohne RETURN"
ER_SP_BAD_CURSOR_QUERY 42000
eng "Cursor statement must be a SELECT"
+ ger "Cursor-Anweisung muss ein SELECT sein"
ER_SP_BAD_CURSOR_SELECT 42000
eng "Cursor SELECT must not have INTO"
+ ger "Cursor-SELECT darf kein INTO haben"
ER_SP_CURSOR_MISMATCH 42000
eng "Undefined CURSOR: %s"
+ ger "Undefinierter CURSOR: %s"
ER_SP_CURSOR_ALREADY_OPEN 24000
eng "Cursor is already open"
ER_SP_CURSOR_NOT_OPEN 24000
eng "Cursor is not open"
ER_SP_UNDECLARED_VAR 42000
eng "Undeclared variable: %s"
+ ger "Nicht deklarierte Variable: %s"
ER_SP_WRONG_NO_OF_FETCH_ARGS
eng "Incorrect number of FETCH variables"
+ ger "Falsche Anzahl von FETCH-Variablen"
ER_SP_FETCH_NO_DATA 02000
eng "No data to FETCH"
+ ger "Keine Daten mit FETCH abzuholen"
ER_SP_DUP_PARAM 42000
eng "Duplicate parameter: %s"
+ ger "Doppelter Parameter: %s"
ER_SP_DUP_VAR 42000
eng "Duplicate variable: %s"
+ ger "Doppelte Variable: %s"
ER_SP_DUP_COND 42000
eng "Duplicate condition: %s"
+ ger "Doppelte Bedingung: %s"
ER_SP_DUP_CURS 42000
eng "Duplicate cursor: %s"
+ ger "Doppelter Cursor: %s"
ER_SP_CANT_ALTER
eng "Failed to ALTER %s %s"
+ ger "ALTER %s %s fehlgeschlagen"
ER_SP_SUBSELECT_NYI 0A000
eng "Subselect value not supported"
ER_STMT_NOT_ALLOWED_IN_SF_OR_TRG 0A000
eng "%s is not allowed in stored function or trigger"
+ ger "%s ist in gespeicherten Funktionen und in Triggern nicht erlaubt"
ER_SP_VARCOND_AFTER_CURSHNDLR 42000
eng "Variable or condition declaration after cursor or handler declaration"
+ ger "Deklaration einer Variablen oder einer Bedingung nach der Deklaration eines Cursors oder eines Handlers"
ER_SP_CURSOR_AFTER_HANDLER 42000
eng "Cursor declaration after handler declaration"
+ ger "Deklaration eines Cursors nach der Deklaration eines Handlers"
ER_SP_CASE_NOT_FOUND 20000
eng "Case not found for CASE statement"
ER_FPARSER_TOO_BIG_FILE
eng "Configuration file '%-.64s' is too big"
ER_FPARSER_BAD_HEADER
eng "Malformed file type header in file '%-.64s'"
+ ger "Nicht wohlgeformter Dateityp-Header in Datei '%-.64s'"
ER_FPARSER_EOF_IN_COMMENT
eng "Unexpected end of file while parsing comment '%-.64s'"
+ ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.64s'"
ER_FPARSER_ERROR_IN_PARAMETER
eng "Error while parsing parameter '%-.64s' (line: '%-.64s')"
+ ger "Fehler beim Parsen des Parameters '%-.64s' (Zeile: '%-.64s')"
ER_FPARSER_EOF_IN_UNKNOWN_PARAMETER
eng "Unexpected end of file while skipping unknown parameter '%-.64s'"
ER_VIEW_NO_EXPLAIN
eng "EXPLAIN/SHOW can not be issued; lacking privileges for underlying table"
ER_FRM_UNKNOWN_TYPE
eng "File '%-.64s' has unknown type '%-.64s' in its header"
+ ger "Datei '%-.64s' hat unbekannten Typ '%-.64s' im Header"
ER_WRONG_OBJECT
eng "'%-.64s.%-.64s' is not %s"
+ ger "'%-.64s.%-.64s' ist nicht %s"
ER_NONUPDATEABLE_COLUMN
eng "Column '%-.64s' is not updatable"
+ ger "Feld '%-.64s' ist nicht aktualisierbar"
ER_VIEW_SELECT_DERIVED
eng "View's SELECT contains a subquery in the FROM clause"
ER_VIEW_SELECT_CLAUSE
eng "View's SELECT contains a '%s' clause"
ER_VIEW_SELECT_VARIABLE
eng "View's SELECT contains a variable or parameter"
ER_VIEW_SELECT_TMPTABLE
eng "View's SELECT refers to a temporary table '%-.64s'"
ER_VIEW_WRONG_LIST
eng "View's SELECT and view's field list have different column counts"
+ ger "SELECT- und Feldliste der Views haben eine unterschiedliche Anzahl von Spalten"
ER_WARN_VIEW_MERGE
eng "View merge algorithm can't be used here for now (assumed undefined algorithm)"
+ ger "View-Merge-Algorithmus kann hier momentan nicht verwendet werden (undefinierter Algorithmus wird angenommen)"
ER_WARN_VIEW_WITHOUT_KEY
eng "View being updated does not have complete key of underlying table in it"
ER_VIEW_INVALID
eng "View '%-.64s.%-.64s' references invalid table(s) or column(s) or function(s) or definer/invoker of view lack rights to use them"
ER_SP_NO_DROP_SP
eng "Can't drop or alter a %s from within another stored routine"
ER_SP_GOTO_IN_HNDLR
eng "GOTO is not allowed in a stored procedure handler"
+ ger "GOTO ist im Handler einer gespeicherten Prozedur nicht erlaubt"
ER_TRG_ALREADY_EXISTS
eng "Trigger already exists"
+ ger "Trigger existiert bereits"
ER_TRG_DOES_NOT_EXIST
eng "Trigger does not exist"
+ ger "Trigger existiert nicht"
ER_TRG_ON_VIEW_OR_TEMP_TABLE
eng "Trigger's '%-.64s' is view or temporary table"
ER_TRG_CANT_CHANGE_ROW
eng "Updating of %s row is not allowed in %strigger"
+ ger "Aktualisieren einer %s-Zeile ist in einem %-Trigger nicht erlaubt"
ER_TRG_NO_SUCH_ROW_IN_TRG
eng "There is no %s row in %s trigger"
+ ger "Es gibt keine %s-Zeile im %s-Trigger"
ER_NO_DEFAULT_FOR_FIELD
eng "Field '%-.64s' doesn't have a default value"
+ ger "Feld '%-.64s' hat keinen Vorgabewert"
ER_DIVISION_BY_ZERO 22012
eng "Division by 0"
+ ger "Division durch 0"
ER_TRUNCATED_WRONG_VALUE_FOR_FIELD
eng "Incorrect %-.32s value: '%-.128s' for column '%.64s' at row %ld"
ER_ILLEGAL_VALUE_FOR_TYPE 22007
eng "Illegal %s '%-.64s' value found during parsing"
ER_VIEW_NONUPD_CHECK
eng "CHECK OPTION on non-updatable view '%-.64s.%-.64s'"
+ ger "CHECK OPTION auf nicht-aktualisierbarem View '%-.64s.%-.64s'"
ER_VIEW_CHECK_FAILED
eng "CHECK OPTION failed '%-.64s.%-.64s'"
+ ger "CHECK OPTION fehlgeschlagen: '%-.64s.%-.64s'"
ER_PROCACCESS_DENIED_ERROR 42000
eng "%-.16s command denied to user '%-.32s'@'%-.64s' for routine '%-.64s'"
ER_RELAY_LOG_FAIL
eng "Failed purging old relay logs: %s"
+ ger "Bereinigen alter Relais-Logs fehlgeschlagen: %s"
ER_PASSWD_LENGTH
eng "Password hash should be a %d-digit hexadecimal number"
+ ger "Passwort-Hash sollte eine Hexdaezimalzahl mit %d Stellen sein"
ER_UNKNOWN_TARGET_BINLOG
eng "Target log not found in binlog index"
+ ger "Ziel-Log im Binlog-Index nicht gefunden"
ER_IO_ERR_LOG_INDEX_READ
eng "I/O error reading log index file"
+ ger "Fehler beim Lesen der Log-Index-Datei"
ER_BINLOG_PURGE_PROHIBITED
eng "Server configuration does not permit binlog purge"
+ ger "Server-Konfiguration erlaubt keine Binlog-Bereinigung"
ER_FSEEK_FAIL
eng "Failed on fseek()"
+ ger "fseek() fehlgeschlagen"
ER_BINLOG_PURGE_FATAL_ERR
eng "Fatal error during log purge"
+ ger "Schwerwiegender Fehler bei der Log-Bereinigung"
ER_LOG_IN_USE
eng "A purgeable log is in use, will not purge"
+ ger "Ein zu bereinigendes Log wird gerade benutzt, daher keine Bereinigung"
ER_LOG_PURGE_UNKNOWN_ERR
eng "Unknown error during log purge"
+ ger "Unbekannter Fehler bei Log-Bereinigung"
ER_RELAY_LOG_INIT
eng "Failed initializing relay log position: %s"
+ ger "Initialisierung der Relais-Log-Position fehlgeschlagen: %s"
ER_NO_BINARY_LOGGING
eng "You are not using binary logging"
ER_RESERVED_SYNTAX
eng "The '%-.64s' syntax is reserved for purposes internal to the MySQL server"
ER_WSAS_FAILED
eng "WSAStartup Failed"
+ ger "WSAStartup fehlgeschlagen"
ER_DIFF_GROUPS_PROC
eng "Can't handle procedures with differents groups yet"
+ ger "Kann Prozeduren mit unterschiedlichen Gruppen noch nicht verarbeiten"
ER_NO_GROUP_FOR_PROC
eng "Select must have a group with this procedure"
+ ger "SELECT muss bei dieser Prozedur ein GROUP BY haben"
ER_ORDER_WITH_PROC
eng "Can't use ORDER clause with this procedure"
+ ger "Kann bei dieser Prozedur keine ORDER-BY-Klausel verwenden"
ER_LOGGING_PROHIBIT_CHANGING_OF
eng "Binary logging and replication forbid changing the global server %s"
ER_NO_FILE_MAPPING
eng "Can't map file: %-.64s, errno: %d"
+ ger "Kann Datei nicht abbilden: %-.64s, Fehler: %d"
ER_WRONG_MAGIC
eng "Wrong magic in %-.64s"
+ ger "Falsche magische Zahlen in %-.64s"
ER_PS_MANY_PARAM
eng "Prepared statement contains too many placeholders"
ER_KEY_PART_0
eng "Key part '%-.64s' length cannot be 0"
ER_VIEW_CHECKSUM
eng "View text checksum failed"
ER_VIEW_MULTIUPDATE
eng "Can not modify more than one base table through a join view '%-.64s.%-.64s'"
ER_VIEW_NO_INSERT_FIELD_LIST
eng "Can not insert into join view '%-.64s.%-.64s' without fields list"
ER_VIEW_DELETE_MERGE_VIEW
eng "Can not delete from join view '%-.64s.%-.64s'"
ER_CANNOT_USER
eng "Operation %s failed for %.256s"
norwegian-ny "Operation %s failed for '%.256s'"
ER_XAER_NOTA XAE04
eng "XAER_NOTA: Unknown XID"
+ ger "XAER_NOTA: Unbekannte XID"
ER_XAER_INVAL XAE05
eng "XAER_INVAL: Invalid arguments (or unsupported command)"
ER_XAER_RMFAIL XAE07
eng "XAER_RMFAIL: The command cannot be executed when global transaction is in the %.64s state"
ER_XAER_OUTSIDE XAE09
eng "XAER_OUTSIDE: Some work is done outside global transaction"
ER_XAER_RMERR XAE03
eng "XAER_RMERR: Fatal error occurred in the transaction branch - check your data for consistency"
ER_XA_RBROLLBACK XA100
eng "XA_RBROLLBACK: Transaction branch was rolled back"
ER_NONEXISTING_PROC_GRANT 42000
eng "There is no such grant defined for user '%-.32s' on host '%-.64s' on routine '%-.64s'"
ER_PROC_AUTO_GRANT_FAIL
eng "Failed to grant EXECUTE and ALTER ROUTINE privileges"
ER_PROC_AUTO_REVOKE_FAIL
eng "Failed to revoke all privileges to dropped routine"
ER_DATA_TOO_LONG 22001
eng "Data too long for column '%s' at row %ld"
ER_SP_BAD_SQLSTATE 42000
eng "Bad SQLSTATE: '%s'"
ER_STARTUP
eng "%s: ready for connections.\nVersion: '%s' socket: '%s' port: %d %s"
ER_LOAD_FROM_FIXED_SIZE_ROWS_TO_VAR
eng "Can't load value from file with fixed size rows to variable"
ER_CANT_CREATE_USER_WITH_GRANT 42000
eng "You are not allowed to create a user with GRANT"
ER_WRONG_VALUE_FOR_TYPE
eng "Incorrect %-.32s value: '%-.128s' for function %-.32s"
ER_TABLE_DEF_CHANGED
eng "Table definition has changed, please retry transaction"
ER_SP_DUP_HANDLER 42000
eng "Duplicate handler declared in the same block"
+ ger "Doppelter Handler im selben Block deklariert"
ER_SP_NOT_VAR_ARG 42000
eng "OUT or INOUT argument %d for routine %s is not a variable"
ER_SP_NO_RETSET 0A000
eng "Not allowed to return a result set from a %s"
ER_CANT_CREATE_GEOMETRY_OBJECT 22003
eng "Cannot get geometry object from data you send to the GEOMETRY field"
ER_FAILED_ROUTINE_BREAK_BINLOG
eng "A routine failed and has neither NO SQL nor READS SQL DATA in its declaration and binary logging is enabled; if non-transactional tables were updated, the binary log will miss their changes"
ER_BINLOG_UNSAFE_ROUTINE
eng "This function has none of DETERMINISTIC, NO SQL, or READS SQL DATA in its declaration and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)"
ER_BINLOG_CREATE_ROUTINE_NEED_SUPER
eng "You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)"
ER_EXEC_STMT_WITH_OPEN_CURSOR
eng "You can't execute a prepared statement which has an open cursor associated with it. Reset the statement to re-execute it."
ER_STMT_HAS_NO_OPEN_CURSOR
eng "The statement (%lu) has no open cursor."
ER_COMMIT_NOT_ALLOWED_IN_SF_OR_TRG
eng "Explicit or implicit commit is not allowed in stored function or trigger."
+ ger "Explizites oder implizites Commit ist in gespeicherten Funktionen und in Triggern nicht erlaubt"
ER_NO_DEFAULT_FOR_VIEW_FIELD
eng "Field of view '%-.64s.%-.64s' underlying table doesn't have a default value"
+ ger "Ein Feld der dem View '%-.64s.%-.64s' zugrundeliegenden Tabelle hat keinen Vorgabewert"
ER_SP_NO_RECURSION
eng "Recursive stored functions and triggers are not allowed."
+ ger "Rekursive gespeicherte Routinen und Triggers sind nicht erlaubt"
ER_TOO_BIG_SCALE 42000 S1009
eng "Too big scale %d specified for column '%-.64s'. Maximum is %d."
ER_TOO_BIG_PRECISION 42000 S1009
eng "Too big precision %d specified for column '%-.64s'. Maximum is %d."
ER_M_BIGGER_THAN_D 42000 S1009
eng "For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '%-.64s')."
ER_WRONG_LOCK_OF_SYSTEM_TABLE
eng "You can't combine write-locking of system '%-.64s.%-.64s' table with other tables"
ER_CONNECT_TO_FOREIGN_DATA_SOURCE
- eng "Unable to connect to foreign data source - database '%.64s'!"
+ eng "Unable to connect to foreign data source: %.64s"
+ ger "Kann nicht mit Fremddatenquelle verbinden: %.64s"
ER_QUERY_ON_FOREIGN_DATA_SOURCE
- eng "There was a problem processing the query on the foreign data source. Data source error: '%-.64s'"
+ eng "There was a problem processing the query on the foreign data source. Data source error: %-.64"
+ ger "Bei der Verarbeitung der Abfrage ist in der Fremddatenquelle ein Problem aufgetreten. Datenquellenfehlermeldung: %-.64s"
ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST
- eng "The foreign data source you are trying to reference does not exist. Data source error : '%-.64s'"
+ eng "The foreign data source you are trying to reference does not exist. Data source error: %-.64s"
+ ger "Die Fremddatenquelle, auf die Sie zugreifen wollen, existiert nicht. Datenquellenfehlermeldung: %-.64s"
ER_FOREIGN_DATA_STRING_INVALID_CANT_CREATE
eng "Can't create federated table. The data source connection string '%-.64s' is not in the correct format"
ER_FOREIGN_DATA_STRING_INVALID
eng "The data source connection string '%-.64s' is not in the correct format"
+ ger "Der Datenquellen-Verbindungsstring '%-.64s' hat kein korrektes Format"
ER_CANT_CREATE_FEDERATED_TABLE
- eng "Can't create federated table. Foreign data src error : '%-.64s'"
+ eng "Can't create federated table. Foreign data src error: %-.64s"
ER_TRG_IN_WRONG_SCHEMA
eng "Trigger in wrong schema"
+ ger "Trigger im falschen Schema"
ER_STACK_OVERRUN_NEED_MORE
eng "Thread stack overrun: %ld bytes used of a %ld byte stack, and %ld bytes needed. Use 'mysqld -O thread_stack=#' to specify a bigger stack."
ER_TOO_LONG_BODY 42000 S1009
eng "Routine body for '%-.100s' is too long"
ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
eng "Cannot drop default keycache"
ER_TOO_BIG_DISPLAYWIDTH 42000 S1009
eng "Display width out of range for column '%-.64s' (max = %d)"
ER_XAER_DUPID XAE08
eng "XAER_DUPID: The XID already exists"
+ ger "XAER_DUPID: Die XID existiert bereits"
ER_DATETIME_FUNCTION_OVERFLOW 22008
eng "Datetime function: %-.32s field overflow"
ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
eng "Can't update table '%-.64s' in stored function/trigger because it is already used by statement which invoked this stored function/trigger."
+ ger "Kann Tabelle '%-.64s' in gespeicherter Funktion oder Trigger nicht aktualisieren, weil sie bereits von der Anweisung verwendet wird, die diese gespeicherte Funktion oder den Trigger aufrief"
ER_VIEW_PREVENT_UPDATE
eng "The definition of table '%-.64s' prevents operation %.64s on table '%-.64s'."
+ ger "Die Definition der Tabelle '%-.64s' verhindert die Operation %.64s auf Tabelle '%-.64s'"
ER_PS_NO_RECURSION
eng "The prepared statement contains a stored routine call that refers to that same statement. It's not allowed to execute a prepared statement in such a recursive manner"
ER_SP_CANT_SET_AUTOCOMMIT
eng "Not allowed to set autocommit from a stored function or trigger"
+ ger "Es ist nicht erlaubt, innerhalb einer gespeicherten Funktion oder eines Triggers AUTOCOMMIT zu setzen"
ER_MALFORMED_DEFINER
- eng "Definer is not fully qualified"
+ eng "Definer is not fully qualified"
ER_VIEW_FRM_NO_USER
- eng "View %-.64s.%-.64s has not definer information (old table format). Current user is used as definer. Please recreate view!"
+ eng "View '%-.64s'.'%-.64s' has no definer information (old table format). Current user is used as definer. Please recreate the view!"
+ ger "View '%-.64s'.'%-.64s' hat keine Definierer-Information (altes Tabellenformat). Der aktuelle Benutzer wird als Definierer verwendet. Bitte erstellen Sie den View neu"
ER_VIEW_OTHER_USER
- eng "You need the SUPER privilege for creation view with %-.64s@%-.64s definer"
+ eng "You need the SUPER privilege for creation view with '%-.64s'@'%-.64s' definer"
+ ger "Sie brauchen die SUPER-Berechtigung, um einen View mit dem Definierer '%-.64s'@'%-.64s' zu erzeugen"
ER_NO_SUCH_USER
eng "There is no '%-.64s'@'%-.64s' registered"
+ ger "'%-.64s'@'%-.64s' ist nicht registriert"
ER_FORBID_SCHEMA_CHANGE
eng "Changing schema from '%-.64s' to '%-.64s' is not allowed."
+ ger "Wechsel des Schemas von '%-.64s' auf '%-.64s' ist nicht erlaubt"
ER_ROW_IS_REFERENCED_2 23000
eng "Cannot delete or update a parent row: a foreign key constraint fails (%.192s)"
ER_NO_REFERENCED_ROW_2 23000
eng "Cannot add or update a child row: a foreign key constraint fails (%.192s)"
ER_SP_BAD_VAR_SHADOW 42000
- eng "Variable '%-.64s' must be quoted with `...`, or renamed"
+ eng "Variable '%-.64s' must be quoted with `...`, or renamed"
ER_TRG_NO_DEFINER
- eng "No definer attribute for trigger '%-.64s'.'%-.64s'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger."
+ eng "No definer attribute for trigger '%-.64s'.'%-.64s'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger."
ER_OLD_FILE_FORMAT
- eng "'%-.64s' has an old format, you should re-create the '%s' object(s)"
+ eng "'%-.64s' has an old format, you should re-create the '%s' object(s)"
ER_SP_RECURSION_LIMIT
eng "Recursive limit %d (as set by the max_sp_recursion_depth variable) was exceeded for routine %.64s"
ER_PARTITION_REQUIRES_VALUES_ERROR
--- 1.22/sql/examples/ha_tina.cc 2005-11-18 17:37:55 +02:00
+++ 1.23/sql/examples/ha_tina.cc 2005-11-24 02:56:09 +02:00
@@ -298,7 +298,7 @@
These are not probably completely right.
*/
current_position(0), next_position(0), chain_alloced(0),
- chain_size(DEFAULT_CHAIN_LENGTH)
+ chain_size(DEFAULT_CHAIN_LENGTH), records_is_known(0)
{
/* Set our original buffers from pre-allocated memory */
buffer.set(byte_buffer, IO_SIZE, system_charset_info);
@@ -534,6 +534,7 @@
*/
if (get_mmap(share, 0) > 0)
DBUG_RETURN(-1);
+ records++;
DBUG_RETURN(0);
}
@@ -700,6 +701,7 @@
current_position= next_position= 0;
records= 0;
+ records_is_known= 0;
chain_ptr= chain;
#ifdef HAVE_MADVISE
if (scan)
@@ -781,7 +783,7 @@
{
DBUG_ENTER("ha_tina::info");
/* This is a lie, but you don't want the optimizer to see zero or 1 */
- if (records < 2)
+ if (!records_is_known && records < 2)
records= 2;
DBUG_VOID_RETURN;
}
@@ -818,6 +820,8 @@
{
DBUG_ENTER("ha_tina::rnd_end");
+ records_is_known= 1;
+
/* First position will be truncate position, second will be increment */
if ((chain_ptr - chain) > 0)
{
@@ -862,18 +866,24 @@
DBUG_RETURN(0);
}
-/*
- Truncate table and others of its ilk call this.
+
+/*
+ DELETE without WHERE calls this
*/
+
int ha_tina::delete_all_rows()
{
DBUG_ENTER("ha_tina::delete_all_rows");
+ if (!records_is_known)
+ return (my_errno=HA_ERR_WRONG_COMMAND);
+
int rc= my_chsize(share->data_file, 0, 0, MYF(MY_WME));
if (get_mmap(share, 0) > 0)
DBUG_RETURN(-1);
+ records=0;
DBUG_RETURN(rc);
}
--- 1.7/sql/examples/ha_tina.h 2005-11-07 17:24:36 +02:00
+++ 1.8/sql/examples/ha_tina.h 2005-11-24 02:38:33 +02:00
@@ -53,6 +53,7 @@
tina_set *chain_ptr;
byte chain_alloced;
uint32 chain_size;
+ bool records_is_known;
public:
ha_tina(TABLE *table_arg);
--- 1.28/sql/tztime.cc 2005-11-23 14:04:15 +02:00
+++ 1.29/sql/tztime.cc 2005-11-24 02:38:33 +02:00
@@ -1532,6 +1532,7 @@
*/
if (!(thd= new THD))
DBUG_RETURN(1);
+ thd->thread_stack= (char*) &thd;
thd->store_globals();
/* Init all memory structures that require explicit destruction */
--- 1.41/mysql-test/mysql-test-run.pl 2005-11-18 17:06:32 +02:00
+++ 1.42/mysql-test/mysql-test-run.pl 2005-11-24 02:38:32 +02:00
@@ -96,6 +96,7 @@
require "lib/mtr_diff.pl";
require "lib/mtr_match.pl";
require "lib/mtr_misc.pl";
+require "lib/mtr_stress.pl";
$Devel::Trace::TRACE= 1;
@@ -271,6 +272,16 @@
our $opt_valgrind_all;
our $opt_valgrind_options;
+our $opt_stress= "";
+our $opt_stress_suite= "main";
+our $opt_stress_mode= "random";
+our $opt_stress_threads= 5;
+our $opt_stress_test_count= 20;
+our $opt_stress_loop_count= "";
+our $opt_stress_test_duration= "";
+our $opt_stress_init_file= "";
+our $opt_stress_test_file= "";
+
our $opt_verbose;
our $opt_wait_for_master;
@@ -391,6 +402,10 @@
{
run_benchmarks(shift); # Shift what? Extra arguments?!
}
+ elsif ( $opt_stress )
+ {
+ run_stress_test()
+ }
else
{
run_tests();
@@ -546,6 +561,17 @@
'valgrind-mysqltest:s' => \$opt_valgrind_mysqltest,
'valgrind-all:s' => \$opt_valgrind_all,
'valgrind-options=s' => \$opt_valgrind_options,
+
+ # Stress testing
+ 'stress' => \$opt_stress,
+ 'stress-suite=s' => \$opt_stress_suite,
+ 'stress-threads=i' => \$opt_stress_threads,
+ 'stress-test-file=s' => \$opt_stress_test_file,
+ 'stress-init-file=s' => \$opt_stress_init_file,
+ 'stress-mode=s' => \$opt_stress_mode,
+ 'stress-loop-count=i' => \$opt_stress_loop_count,
+ 'stress-test-count=i' => \$opt_stress_test_count,
+ 'stress-test-duration=i' => \$opt_stress_test_duration,
# Misc
'big-test' => \$opt_big_test,
--- 1.115/include/my_global.h 2005-11-23 14:04:05 +02:00
+++ 1.116/include/my_global.h 2005-11-24 02:38:32 +02:00
@@ -662,11 +662,7 @@
#define FN_LEN 256 /* Max file name len */
#define FN_HEADLEN 253 /* Max length of filepart of file name */
#define FN_EXTLEN 20 /* Max length of extension (part of FN_LEN) */
-#ifdef PATH_MAX
-#define FN_REFLEN PATH_MAX/* Max length of full path-name */
-#else
#define FN_REFLEN 512 /* Max length of full path-name */
-#endif
#define FN_EXTCHAR '.'
#define FN_HOMELIB '~' /* ~/ is used as abbrev for home dir */
#define FN_CURLIB '.' /* ./ is used as abbrev for current dir */
--- 1.42/mysql-test/r/grant.result 2005-08-25 19:49:39 +03:00
+++ 1.43/mysql-test/r/grant.result 2005-11-24 02:38:32 +02:00
@@ -238,7 +238,7 @@
GRANT USAGE ON *.* TO 'drop_user'@'localhost'
drop user drop_user@localhost;
revoke all privileges, grant option from drop_user@localhost;
-ERROR HY000: Can't revoke all privileges, grant for one or more of the requested users
+ERROR HY000: Can't revoke all privileges for one or more of the requested users
grant select(a) on test.t1 to drop_user1@localhost;
grant select on test.t1 to drop_user2@localhost;
grant select on test.* to drop_user3@localhost;
@@ -247,7 +247,7 @@
drop_user4@localhost;
revoke all privileges, grant option from drop_user1@localhost, drop_user2@localhost,
drop_user3@localhost, drop_user4@localhost;
-ERROR HY000: Can't revoke all privileges, grant for one or more of the requested users
+ERROR HY000: Can't revoke all privileges for one or more of the requested users
drop user drop_user1@localhost, drop_user2@localhost, drop_user3@localhost,
drop_user4@localhost;
ERROR HY000: Operation DROP USER failed for 'drop_user1'@'localhost','drop_user2'@'localhost','drop_user3'@'localhost','drop_user4'@'localhost'
--- 1.42/sql/ha_federated.cc 2005-11-23 14:04:06 +02:00
+++ 1.43/sql/ha_federated.cc 2005-11-24 02:38:32 +02:00
@@ -488,8 +488,7 @@
table, and if so, does the foreign table exist.
*/
-static int check_foreign_data_source(
- FEDERATED_SHARE *share,
+static int check_foreign_data_source(FEDERATED_SHARE *share,
bool table_create_flag)
{
char escaped_table_name[NAME_LEN*2];
@@ -515,15 +514,17 @@
share->port,
share->socket, 0))
{
- /*
- we want the correct error message, but it to return
- ER_CANT_CREATE_FEDERATED_TABLE if called by ::create
- */
- error_code= table_create_flag?
- ER_CANT_CREATE_FEDERATED_TABLE : ER_CONNECT_TO_FOREIGN_DATA_SOURCE;
+ /*
+ we want the correct error message, but it to return
+ ER_CANT_CREATE_FEDERATED_TABLE if called by ::create
+ */
+ error_code= (table_create_flag ?
+ ER_CANT_CREATE_FEDERATED_TABLE :
+ ER_CONNECT_TO_FOREIGN_DATA_SOURCE);
my_sprintf(error_buffer,
- (error_buffer, " database %s username %s hostname %s",
+ (error_buffer,
+ "database: '%s' username: '%s' hostname: '%s'",
share->database, share->username, share->hostname));
my_error(ER_CONNECT_TO_FOREIGN_DATA_SOURCE, MYF(0), error_buffer);
@@ -564,8 +565,8 @@
{
error_code= table_create_flag ?
ER_CANT_CREATE_FEDERATED_TABLE : ER_FOREIGN_DATA_SOURCE_DOESNT_EXIST;
- my_sprintf(error_buffer, (error_buffer, ": %d : %s",
- mysql_errno(mysql), mysql_error(mysql)));
+ my_sprintf(error_buffer, (error_buffer, "error: %d '%s'",
+ mysql_errno(mysql), mysql_error(mysql)));
my_error(error_code, MYF(0), error_buffer);
goto error;
@@ -2032,7 +2033,7 @@
}
if (mysql_real_query(mysql, sql_query.ptr(), sql_query.length()))
{
- my_sprintf(error_buffer, (error_buffer, ": %d : %s",
+ my_sprintf(error_buffer, (error_buffer, "error: %d '%s'",
mysql_errno(mysql), mysql_error(mysql)));
retval= ER_QUERY_ON_FOREIGN_DATA_SOURCE;
goto error;
--- 1.214/BitKeeper/etc/ignore 2005-11-18 17:06:24 +02:00
+++ 1.215/BitKeeper/etc/ignore 2005-11-24 02:38:17 +02:00
@@ -469,6 +469,7 @@
libmysqld/gstream.cc
libmysqld/ha_archive.cc
libmysqld/ha_berkeley.cc
+libmysqld/ha_blackhole.cc
libmysqld/ha_example.cc
libmysqld/ha_federated.cc
libmysqld/ha_heap.cc
| Thread |
|---|
| • bk commit into 5.1 tree (monty:1.1965) | monty | 24 Nov |
