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"
@@ -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"
ER_WRONG_FK_DEF 42000
eng "Incorrect foreign key definition for '%-.64s': %s"
+ nla "Incorrecte foreign key definitie voor '%-.64s': %s"
ER_KEY_REF_DO_NOT_MATCH_TABLE_REF
eng "Key reference and table reference don't match"
+ nla "Sleutel- en tabelreferentie komen niet overeen"
spa "Referencia de llave y referencia de tabla no coinciden"
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"
spa "Operando debe tener %d columna(s)"
ER_SUBQUERY_NO_1_ROW 21000
eng "Subquery returns more than 1 row"
+ nla "Subquery retourneert meer dan 1 rij"
por "Subconsulta retorna mais que 1 registro"
@@ -4749,6 +4755,7 @@
dan "Unknown prepared statement handler (%.*s) given to %s"
eng "Unknown prepared statement handler (%.*s) given to %s"
+ nla "Onebekende prepared statement handler (%.*s) voor %s aangegeven"
spa "Desconocido preparado comando handler (%.*s) dado para %s"
@@ -4756,12 +4763,14 @@
ER_CORRUPT_HELP_DB
eng "Help database is corrupt or does not exist"
+ nla "Help database is beschadigd of bestaat niet"
ER_CYCLIC_REFERENCE
eng "Cyclic reference on subqueries"
ger "Zyklischer Verweis in Unterabfragen"
+ nla "Cyclische verwijzing in subqueries"
@@ -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"
spa "Convirtiendo columna '%s' de %s para %s"
@@ -4778,6 +4788,7 @@
ER_ILLEGAL_REFERENCE 42S22
eng "Reference '%-.64s' not supported (%s)"
+ nla "Verwijzing '%-.64s' niet ondersteund (%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"
+ nla "Voor elke afgeleide tabel moet een unieke alias worden gebruikt"
spa "Cada tabla derivada debe tener su propio alias"
ER_SELECT_REDUCED 01000
eng "Select %u was reduced during optimization"
+ nla "Select %u werd geredureerd tijdens optimtalisatie"
@@ -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"
spa "Tabla '%-.64s' de uno de los SELECT no puede ser usada en %-.32s"
ER_NOT_SUPPORTED_AUTH_MODE 08004
eng "Client does not support authentication protocol requested by server; consider upgrading MySQL client"
+ nla "Client ondersteunt het door de server verwachtte authenticatieprotocol niet. Overweeg een nieuwere MySQL client te gebruiken"
ER_SPATIAL_CANT_HAVE_NULL 42000
eng "All parts of a SPATIAL index must be NOT NULL"
+ 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"
ER_COLLATION_CHARSET_MISMATCH 42000
eng "COLLATION '%s' is not valid for CHARACTER SET '%s'"
+ nla "COLLATION '%s' is niet geldig voor CHARACTER SET '%s'"
ER_SLAVE_WAS_RUNNING
eng "Slave is already running"
+ nla "Slave is reeds actief"
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"
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)"
+ nla "Ongecomprimeerder data is te groot; de maximum lengte is %d (waarschijnlijk, de lengte van de gecomprimeerde data was beschadigd)"
ER_ZLIB_Z_MEM_ERROR
eng "ZLIB: Not enough memory"
ger "ZLIB: Nicht genug Speicher"
+ nla "ZLIB: Onvoldoende geheugen"
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)"
+ nla "ZLIB: Onvoldoende ruimte in uitgaande buffer (waarschijnlijk, de lengte van de ongecomprimeerde data was beschadigd)"
ER_ZLIB_Z_DATA_ERROR
eng "ZLIB: Input data corrupted"
+ nla "ZLIB: Invoer data beschadigd"
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()"
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"
+ nla "Rij %ld bevat niet de data voor alle kolommen"
ER_WARN_TOO_MANY_RECORDS 01000
eng "Row %ld was truncated; it contained more data than there were input columns"
+ nla "Regel %ld ingekort, bevatte meer data dan invoer kolommen"
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);
}
| Thread |
|---|
| • bk commit into 5.1 tree (msvensson:1.2319) | msvensson | 11 Sep |
