diff options
| author | unknown <bell@sanja.is.com.ua> | 2002-06-05 21:32:22 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2002-06-05 21:32:22 +0300 |
| commit | 954a0583f8408927184f12ef67527037e10b36d2 (patch) | |
| tree | 945cc821cedde0c371ca804a2556598b1d087da7 /sql/share/spanish | |
| parent | a532bfb2ea0a0d1cfc0c8d25e6a18cf5a8c0c5bc (diff) | |
| parent | fa86b948379ca3929ebd8a7b941d6c2fbb26f8ec (diff) | |
| download | mariadb-git-954a0583f8408927184f12ef67527037e10b36d2.tar.gz | |
merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/share/spanish')
| -rw-r--r-- | sql/share/spanish/errmsg.txt | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt index 2e371e75cbd..2eca37146e4 100644 --- a/sql/share/spanish/errmsg.txt +++ b/sql/share/spanish/errmsg.txt @@ -148,7 +148,7 @@ "%-.16s comando negado para usuario: '%-.32s@%-.64s' para columna '%-.64s' en la tabla '%-.64s'", "Ilegal comando GRANT/REVOKE. Por favor consulte el manual para cuales permisos pueden ser usados.", "El argumento para servidor o usuario para GRANT es demasiado grande", -"Tabla '%-64s.%s' no existe", +"Tabla '%-.64s.%s' no existe", "No existe tal permiso definido para usuario '%-.32s' en el servidor '%-.64s' en la tabla '%-.64s'", "El comando usado no es permitido con esta versión de MySQL", "Algo está equivocado en su sintax", @@ -195,7 +195,7 @@ "Error de red escribiendo para el master", "No puedo encontrar índice FULLTEXT correspondiendo a la lista de columnas", "No puedo ejecutar el comando dado porque tienes tablas bloqueadas o una transición activa", -"Desconocida variable de sistema '%-.64'", +"Desconocida variable de sistema '%-.64s'", "Tabla '%-.64s' está marcada como crashed y debe ser reparada", "Tabla '%-.64s' está marcada como crashed y la última reparación (automactica?) falló", "Aviso: Algunas tablas no transancionales no pueden tener rolled back", @@ -228,6 +228,8 @@ "Can't execute the query because you have a conflicting read lock", "Mixing of transactional and non-transactional tables is disabled", "Option '%s' used twice in statement", -"User '%-64s' has exceeded the '%s' resource (current value: %ld)", +"User '%-.64s' has exceeded the '%s' resource (current value: %ld)", +"Wrong foreign key definition for '%-.64s': %s", +"Key reference and table reference doesn't match", "Subselect return more than 1 field", "Subselect return more than 1 record", |