bk commit into 5.1 tree (msvensson:1.2319)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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@stripped, 2006-09-11 16:44:10+02:00, msvensson@shellback.(none) +3 -0
  Merge shellback.(none):/home/msvensson/mysql/mysql-5.1
  into  shellback.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.2309.3.5

  sql/share/errmsg.txt@stripped, 2006-09-11 16:44:06+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.120.1.1

  storage/innobase/Makefile.am@stripped, 2006-09-11 16:44:06+02:00, msvensson@shellback.(none)
+0 -0
    Auto merged
    MERGE: 1.16.1.2

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-09-11 16:44:06+02:00,
msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.284.4.6

  storage/innobase/handler/ha_innodb.cc@stripped, 2006-09-11 16:44:05+02:00,
msvensson@shellback.(none) +0 -0
    Merge rename: sql/ha_innodb.cc -> storage/innobase/handler/ha_innodb.cc

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.123/sql/share/errmsg.txt	2006-09-11 16:44:19 +02:00
+++ 1.124/sql/share/errmsg.txt	2006-09-11 16:44:19 +02:00
@@ -4710,6 +4710,7 @@
 ER_SLAVE_IGNORED_TABLE  
         eng "Slave SQL thread ignored the query because of replicate-*-table rules"
         ger "Slave-SQL-Thread hat die Abfrage aufgrund von replicate-*-table-Regeln
ignoriert"
+        nla "Slave SQL thread negeerde de query vanwege replicate-*-table opties"
         por "Slave SQL thread ignorado a consulta devido às normas de
replicação-*-tabela"
         spa "Slave SQL thread ignorado el query debido a las reglas de
replicación-*-tabla"
         swe "Slav SQL tråden ignorerade frågan pga en replicate-*-table regel"
@@ -4717,29 +4718,34 @@
         eng "Variable '%-.64s' is a %s variable"
         serbian "Incorrect foreign key definition for '%-.64s': %s"
         ger "Variable '%-.64s' ist eine %s-Variable"
+        nla "Variabele '%-.64s' is geen %s variabele"
         spa "Variable '%-.64s' es una %s variable"
         swe "Variabel '%-.64s' är av typ %s"
 ER_WRONG_FK_DEF 42000 
         eng "Incorrect foreign key definition for '%-.64s': %s"
         ger "Falsche Fremdschlüssel-Definition für '%-.64s': %s"
+        nla "Incorrecte foreign key definitie voor '%-.64s': %s"
         por "Definição errada da chave estrangeira para '%-.64s': %s"
         spa "Equivocada definición de llave extranjera para '%-.64s': %s"
         swe "Felaktig FOREIGN KEY-definition för '%-.64s': %s"
 ER_KEY_REF_DO_NOT_MATCH_TABLE_REF  
         eng "Key reference and table reference don't match"
         ger "Schlüssel- und Tabellenverweis passen nicht zusammen"
+        nla "Sleutel- en tabelreferentie komen niet overeen"
         por "Referência da chave e referência da tabela não coincidem"
         spa "Referencia de llave y referencia de tabla no coinciden"
         swe "Nyckelreferensen och tabellreferensen stämmer inte överens"
 ER_OPERAND_COLUMNS 21000 
         eng "Operand should contain %d column(s)"
         ger "Operand sollte %d Spalte(n) enthalten"
+        nla "Operand behoort %d kolommen te bevatten"
         rus "ïÐÅÒÁÎÄ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ %d ËÏÌÏÎÏË"
         spa "Operando debe tener %d columna(s)"
         ukr "ïÐÅÒÁÎÄ ÍÁ¤ ÓËÌÁÄÁÔÉÓÑ Ú %d æ×"
 ER_SUBQUERY_NO_1_ROW 21000 
         eng "Subquery returns more than 1 row"
         ger "Unterabfrage lieferte mehr als einen Datensatz zurück"
+        nla "Subquery retourneert meer dan 1 rij"
         por "Subconsulta retorna mais que 1 registro"
         rus "ðÏÄÚÁÐÒÏÓ ×ÏÚ×ÒÁÝÁÅÔ ÂÏÌÅÅ ÏÄÎÏÊ ÚÁÐÉÓÉ"
         spa "Subconsulta retorna mas que 1 línea"
@@ -4749,6 +4755,7 @@
         dan "Unknown prepared statement handler (%.*s) given to %s"
         eng "Unknown prepared statement handler (%.*s) given to %s"
         ger "Unbekannter Prepared-Statement-Handler (%.*s) für %s angegeben"
+        nla "Onebekende prepared statement handler (%.*s) voor %s aangegeven"
         por "Desconhecido manipulador de declaração preparado (%.*s) determinado para %s"
         spa "Desconocido preparado comando handler (%.*s) dado para %s"
         swe "Okänd PREPARED STATEMENT id (%.*s) var given till %s"
@@ -4756,12 +4763,14 @@
 ER_CORRUPT_HELP_DB  
         eng "Help database is corrupt or does not exist"
         ger "Die Hilfe-Datenbank ist beschädigt oder existiert nicht"
+        nla "Help database is beschadigd of bestaat niet"
         por "Banco de dado de ajuda corrupto ou não existente"
         spa "Base de datos Help está corrupto o no existe"
         swe "Hjälpdatabasen finns inte eller är skadad"
 ER_CYCLIC_REFERENCE  
         eng "Cyclic reference on subqueries"
         ger "Zyklischer Verweis in Unterabfragen"
+        nla "Cyclische verwijzing in subqueries"
         por "Referência cíclica em subconsultas"
         rus "ãÉËÌÉÞÅÓËÁÑ ÓÓÙÌËÁ ÎÁ ÐÏÄÚÁÐÒÏÓ"
         spa "Cíclica referencia en subconsultas"
@@ -4770,6 +4779,7 @@
 ER_AUTO_CONVERT  
         eng "Converting column '%s' from %s to %s"
         ger "Feld '%s' wird von %s nach %s umgewandelt"
+        nla "Veld '%s' wordt van %s naar %s geconverteerd"
         por "Convertendo coluna '%s' de %s para %s"
         rus "ðÒÅÏÂÒÁÚÏ×ÁÎÉÅ ÐÏÌÑ '%s' ÉÚ %s × %s"
         spa "Convirtiendo columna '%s' de %s para %s"
@@ -4778,6 +4788,7 @@
 ER_ILLEGAL_REFERENCE 42S22 
         eng "Reference '%-.64s' not supported (%s)"
         ger "Verweis '%-.64s' wird nicht unterstützt (%s)"
+        nla "Verwijzing '%-.64s' niet ondersteund (%s)"
         por "Referência '%-.64s' não suportada (%s)"
         rus "óÓÙÌËÁ '%-.64s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ (%s)"
         spa "Referencia '%-.64s' no soportada (%s)"
@@ -4786,12 +4797,14 @@
 ER_DERIVED_MUST_HAVE_ALIAS 42000 
         eng "Every derived table must have its own alias"
         ger "Für jede abgeleitete Tabelle muss ein eigener Alias angegeben werden"
+        nla "Voor elke afgeleide tabel moet een unieke alias worden gebruikt"
         por "Cada tabela derivada deve ter seu próprio alias"
         spa "Cada tabla derivada debe tener su propio alias"
         swe "Varje 'derived table' måste ha sitt eget alias"
 ER_SELECT_REDUCED 01000 
         eng "Select %u was reduced during optimization"
         ger "Select %u wurde während der Optimierung reduziert"
+        nla "Select %u werd geredureerd tijdens optimtalisatie"
         por "Select %u foi reduzido durante otimização"
         rus "Select %u ÂÙÌ ÕÐÒÁÚÄÎÅÎ × ÐÒÏÃÅÓÓÅ ÏÐÔÉÍÉÚÁÃÉÉ"
         spa "Select %u fué reducido durante optimización"
@@ -4800,62 +4813,73 @@
 ER_TABLENAME_NOT_ALLOWED_HERE 42000 
         eng "Table '%-.64s' from one of the SELECTs cannot be used in %-.32s"
         ger "Tabelle '%-.64s', die in einem der SELECT-Befehle verwendet wurde, kann
nicht in %-.32s verwendet werden"
+        nla "Tabel '%-.64s' uit een van de SELECTS kan niet in %-.32s gebruikt worden"
         por "Tabela '%-.64s' de um dos SELECTs não pode ser usada em %-.32s"
         spa "Tabla '%-.64s' de uno de los SELECT no puede ser usada en %-.32s"
         swe "Tabell '%-.64s' från en SELECT kan inte användas i %-.32s"
 ER_NOT_SUPPORTED_AUTH_MODE 08004 
         eng "Client does not support authentication protocol requested by server;
consider upgrading MySQL client"
         ger "Client unterstützt das vom Server erwartete Authentifizierungsprotokoll
nicht. Bitte aktualisieren Sie Ihren MySQL-Client"
+        nla "Client ondersteunt het door de server verwachtte authenticatieprotocol niet.
Overweeg een nieuwere MySQL client te gebruiken"
         por "Cliente não suporta o protocolo de autenticação exigido pelo servidor;
considere a atualização do cliente MySQL"
         spa "Cliente no soporta protocolo de autenticación solicitado por el servidor;
considere actualizar el cliente MySQL"
         swe "Klienten stöder inte autentiseringsprotokollet som begärts av servern;
överväg uppgradering av klientprogrammet."
 ER_SPATIAL_CANT_HAVE_NULL 42000 
         eng "All parts of a SPATIAL index must be NOT NULL"
         ger "Alle Teile eines SPATIAL-Index müssen als NOT NULL deklariert sein"
+        nla "Alle delete van een  SPATIAL index dienen als NOT NULL gedeclareerd te
worden"
         por "Todas as partes de uma SPATIAL index devem ser NOT NULL"
         spa "Todas las partes de una SPATIAL index deben ser NOT NULL"
         swe "Alla delar av en SPATIAL index måste vara NOT NULL"
 ER_COLLATION_CHARSET_MISMATCH 42000 
         eng "COLLATION '%s' is not valid for CHARACTER SET '%s'"
         ger "COLLATION '%s' ist für CHARACTER SET '%s' ungültig"
+        nla "COLLATION '%s' is niet geldig voor CHARACTER SET '%s'"
         por "COLLATION '%s' não é válida para CHARACTER SET '%s'"
         spa "COLLATION '%s' no es válido para CHARACTER SET '%s'"
         swe "COLLATION '%s' är inte tillåtet för CHARACTER SET '%s'"
 ER_SLAVE_WAS_RUNNING  
         eng "Slave is already running"
         ger "Slave läuft bereits"
+        nla "Slave is reeds actief"
         por "O slave já está rodando"
         spa "Slave ya está funcionando"
         swe "Slaven har redan startat"
 ER_SLAVE_WAS_NOT_RUNNING  
         eng "Slave already has been stopped"
         ger "Slave wurde bereits angehalten"
+        nla "Slave is reeds gestopt"
         por "O slave já está parado"
         spa "Slave ya fué parado"
         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)"
         ger "Unkomprimierte Daten sind zu groß. Die maximale Größe beträgt %d
(wahrscheinlich wurde die Länge der unkomprimierten Daten beschädigt)"
+        nla "Ongecomprimeerder data is te groot; de maximum lengte is %d (waarschijnlijk,
de lengte van de gecomprimeerde data was beschadigd)"
         por "Tamanho muito grande dos dados des comprimidos. O máximo tamanho é %d.
(provavelmente, o comprimento dos dados descomprimidos está corrupto)"
         spa "Tamaño demasiado grande para datos descomprimidos. El máximo tamaño es %d.
(probablemente, extensión de datos descomprimidos fué corrompida)"
 ER_ZLIB_Z_MEM_ERROR  
         eng "ZLIB: Not enough memory"
         ger "ZLIB: Nicht genug Speicher"
+        nla "ZLIB: Onvoldoende geheugen"
         por "ZLIB: Não suficiente memória disponível"
         spa "Z_MEM_ERROR: No suficiente memoria para zlib"
 ER_ZLIB_Z_BUF_ERROR  
         eng "ZLIB: Not enough room in the output buffer (probably, length of uncompressed
data was corrupted)"
         ger "ZLIB: Im Ausgabepuffer ist nicht genug Platz vorhanden (wahrscheinlich wurde
die Länge der unkomprimierten Daten beschädigt)"
+        nla "ZLIB: Onvoldoende ruimte in uitgaande buffer (waarschijnlijk, de lengte van
de ongecomprimeerde data was beschadigd)"
         por "ZLIB: Não suficiente espaço no buffer emissor (provavelmente, o comprimento
dos dados descomprimidos está corrupto)"
         spa "Z_BUF_ERROR: No suficiente espacio en el búfer de salida para zlib
(probablemente, extensión de datos descomprimidos fué corrompida)"
 ER_ZLIB_Z_DATA_ERROR  
         eng "ZLIB: Input data corrupted"
         ger "ZLIB: Eingabedaten beschädigt"
+        nla "ZLIB: Invoer data beschadigd"
         por "ZLIB: Dados de entrada está corrupto"
         spa "ZLIB: Dato de entrada fué corrompido para zlib"
 ER_CUT_VALUE_GROUP_CONCAT  
         eng "%d line(s) were cut by GROUP_CONCAT()"
         ger "%d Zeile(n) durch GROUP_CONCAT() abgeschnitten"
+        nla "%d regel(s) door GROUP_CONCAT() ingekort"
         por "%d linha(s) foram cortada(s) por GROUP_CONCAT()"
         spa "%d línea(s) fue(fueron) cortadas por group_concat()"
         swe "%d rad(er) kapades av group_concat()"
@@ -4863,11 +4887,13 @@
 ER_WARN_TOO_FEW_RECORDS 01000 
         eng "Row %ld doesn't contain data for all columns"
         ger "Zeile %ld enthält nicht für alle Felder Daten"
+        nla "Rij %ld bevat niet de data voor alle kolommen"
         por "Conta de registro é menor que a conta de coluna na linha %ld"
         spa "Línea %ld no contiene datos para todas las columnas"
 ER_WARN_TOO_MANY_RECORDS 01000 
         eng "Row %ld was truncated; it contained more data than there were input columns"
         ger "Zeile %ld gekürzt, die Zeile enthielt mehr Daten, als es Eingabefelder gibt"
+        nla "Regel %ld ingekort, bevatte meer data dan invoer kolommen"
         por "Conta de registro é maior que a conta de coluna na linha %ld"
         spa "Línea %ld fué truncada; La misma contine mas datos que las que existen en
las columnas de entrada"
 ER_WARN_NULL_TO_NOTNULL 22004 

--- 1.19/storage/innobase/Makefile.am	2006-09-11 16:44:19 +02:00
+++ 1.20/storage/innobase/Makefile.am	2006-09-11 16:44:19 +02:00
@@ -34,6 +34,7 @@
 
 SUBDIRS =		os ut btr buf data dict dyn eval fil fsp fut \
 			ha ibuf lock log mach mem mtr page \
+			handler \
 			pars que read rem row srv sync thr trx usr
 
 EXTRA_DIST = 	include/btr0btr.h include/btr0btr.ic include/btr0cur.h include/btr0cur.ic \
@@ -86,6 +87,7 @@
 		include/univ.i include/usr0sess.h include/usr0sess.ic include/usr0types.h \
 		include/ut0byte.h include/ut0byte.ic include/ut0dbg.h include/ut0lst.h \
 		include/ut0mem.h include/ut0mem.ic include/ut0rnd.h include/ut0rnd.ic \
+		handler/ha_innodb.h \
 		include/ut0sort.h include/ut0ut.h include/ut0ut.ic include/ut0vec.h include/ut0vec.ic
include/ha_prototypes.h \
 		include/ut0list.h include/ut0list.ic \
 		include/ut0wqueue.h \
@@ -102,6 +104,7 @@
 			page/libpage.a rem/librem.a thr/libthr.a \
 			sync/libsync.a data/libdata.a mach/libmach.a \
 			ha/libha.a dyn/libdyn.a mem/libmem.a \
+			handler/libhandler.a \
 			ut/libut.a os/libos.a ut/libut.a
 libinnobase_a_SOURCES =	
 

--- 1.293/sql/ha_innodb.cc	2006-09-11 16:44:19 +02:00
+++ 1.295/storage/innobase/handler/ha_innodb.cc	2006-09-11 16:44:19 +02:00
@@ -31,10 +31,9 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
-#include "mysql_priv.h"
+#include <mysql_priv.h>
 #ifdef WITH_INNOBASE_STORAGE_ENGINE
 
-#include "slave.h"
 
 #include <m_ctype.h>
 #include <hash.h>
@@ -1603,21 +1602,6 @@
 	pthread_cond_init(&commit_cond, NULL);
 	innodb_inited= 1;
 
-	/* If this is a replication slave and we needed to do a crash recovery,
-	set the master binlog position to what InnoDB internally knew about
-	how far we got transactions durable inside InnoDB. There is a
-	problem here: if the user used also MyISAM tables, InnoDB might not
-	know the right position for them.
-
-	THIS DOES NOT WORK CURRENTLY because replication seems to initialize
-	glob_mi also after innobase_init. */
-
-/*	if (trx_sys_mysql_master_log_pos != -1) {
-		ut_memcpy(glob_mi.log_file_name, trx_sys_mysql_master_log_name,
-				1 + ut_strlen(trx_sys_mysql_master_log_name));
-		glob_mi.pos = trx_sys_mysql_master_log_pos;
-	}
-*/
 	DBUG_RETURN(FALSE);
 error:
 	have_innodb= SHOW_OPTION_DISABLED;	// If we couldn't use handler
@@ -1691,19 +1675,6 @@
 
 		return;
 	}
-
-#ifdef HAVE_REPLICATION
-	THD *thd=current_thd;
-
-	if (thd && thd->slave_thread) {
-		/* Update the replication position info inside InnoDB */
-
-		trx->mysql_master_log_file_name
-					= active_mi->rli.group_master_log_name;
-		trx->mysql_master_log_pos = ((ib_longlong)
-				active_mi->rli.future_group_master_log_pos);
-	}
-#endif /* HAVE_REPLICATION */
 
 	trx_commit_for_mysql(trx);
 }