diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:02:16 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-07-01 15:02:16 +0300 |
| commit | 5a3c12effb4a0d32bf6b77d4b19edcf1757bb823 (patch) | |
| tree | 1dd88e8c946c87dfaa131fd495d71766127a0e94 /sql/share | |
| parent | 23a9a5805cd258c5699e782cebdb5763acb1d85d (diff) | |
| parent | 1726ae86be52bc129b5788406d60808b15b8bd9f (diff) | |
| download | mariadb-git-5a3c12effb4a0d32bf6b77d4b19edcf1757bb823.tar.gz | |
Merge with 3.23 tree to get latest bug fixes
BitKeeper/etc/logging_ok:
auto-union
sql/item_func.cc:
Auto merged
mysql-test/t/user_var.test:
Auto merged
sql/log_event.cc:
Auto merged
sql/log_event.h:
Auto merged
sql/nt_servc.cc:
Auto merged
configure.in:
Use local version
innobase/os/os0file.c:
Use local version
innobase/page/page0page.c:
Use local version
innobase/row/row0sel.c:
Use local version
innobase/row/row0vers.c:
Use local version
mysql-test/r/order_by.result:
Use local version
mysql-test/r/user_var.result:
merge with 3.23
mysql-test/t/order_by.test:
Use local version (test is already in range.test)
sql/log.cc:
Use local version
sql/share/spanish/errmsg.txt:
merge
sql/slave.cc:
Use local version
sql/sql_class.h:
Use local version
sql/sql_select.cc:
Use patch in 4.0 for range with NULL problem
Diffstat (limited to 'sql/share')
| -rw-r--r-- | sql/share/spanish/errmsg.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index d566642f1c9..c8e33325786 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -212,14 +212,14 @@ "Bloqueos de actualización no pueden ser adqueridos durante una transición READ UNCOMMITTED", "DROP DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global", "CREATE DATABASE no permitido mientras un thread está ejerciendo un bloqueo de lectura global", -"Wrong arguments to %s", -"%-.32s@%-.64s is not allowed to create new users", -"Incorrect table definition; All MERGE tables must be in the same database", -"Deadlock found when trying to get lock; Try restarting transaction", -"The used table type doesn't support FULLTEXT indexes", -"Cannot add foreign key constraint", -"Cannot add a child row: a foreign key constraint fails", -"Cannot delete a parent row: a foreign key constraint fails", +"Argumentos errados para %s", +"%-.32s@%-.64s no es permitido para crear nuevos usuarios", +"Incorrecta definición de la tabla; Todas las tablas MERGE deben estar en el mismo banco de datos", +"Encontrado deadlock cuando tentando obtener el bloqueo; Tente recomenzar la transición", +"El tipo de tabla usada no soporta índices FULLTEXT", +"No puede adicionar clave extranjera constraint", +"No puede adicionar una línea hijo: falla de clave extranjera constraint", +"No puede deletar una línea padre: falla de clave extranjera constraint", "Error de coneccion a master: %-128s", "Error executando el query en master: %-128%", "Error de %s: %-128%", |