Skip to content

M
MariaDB
Commit 1271608e authored by unknown's avatar unknown
Browse files
Options

merged 


BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Docs/manual.texi:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/share/spanish/errmsg.txt:
  merged and translated the new 4.0 errors - had to type them in 
  anyway so figured I'd do it in Spanish - Jorge/Miguel - can you do QA
  on my translation?
parents e9347b1b beb2aa5e
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 137 deletions
.bzrignore
View file @ 1271608e
......@@ -281,6 +281,8 @@ myisam/mi_test_all
myisam/myisamchk
myisam/myisamlog
myisam/myisampack
myisam/test1.MYD
myisam/test1.MYI
mysql-test/gmon.out
mysql-test/install_test_db
mysql-test/mysql-test-run
......
BitKeeper/etc/logging_ok
View file @ 1271608e
......@@ -5,6 +5,7 @@ jani@janikt.pp.saunalahti.fi
jcole@abel.spaceapes.com
jcole@main.burghcom.com
jcole@tetra.spaceapes.com
miguel@light.local
monty@donna.mysql.fi
monty@hundin.mysql.fi
monty@tik.mysql.fi
......
Docs/Support/texi2html
View file @ 1271608e
......@@ -845,7 +845,7 @@ READ_LINE: while ($_ = &next_line)
print "# end of multitable with $multitable_cols columns\n"
if $debug and $DEBUG_USER;
$in_multitable = 0;
push(@lines, "</TR>\n");
push(@lines, "</TD></TR>\n");
&html_pop_if('TR');
push(@lines, "</TABLE>\n");
&html_pop_if('TABLE');
......@@ -1076,9 +1076,9 @@ EOC
{
# All this is a **HACK**.
# It does only work for a FEW SIMPLE CASES !!!
push(@lines, &debug("</TR>\n", __LINE__))
unless $html_element eq 'TABLE';;
&html_pop_if('TR');
push(@lines, &debug("</TD></TR>\n", __LINE__))
unless $html_element eq 'TABLE';
&html_pop_if('TR');
$what =~ s|\s+\@tab\s*| </TD><TD> |g;
push(@lines, &debug("<TR><TD>$what\n", __LINE__));
&html_push('TR');
......
Docs/manual.ja.texi
View file @ 1271608e
......@@ -33032,7 +33032,7 @@ Performance handicapping system for yachts. Uses PHP. By
@item @uref{http://www.mysql.com/Contrib/hylalog-1.0.tar.gz, hylalog-1.0.tar.gz}
Store @code{hylafax} outgoing faxes in a @strong{MySQL} database. By Sinisa
Milivojevic, @email{sinisa@@coresinc.com}.
Milivojevic, @email{sinisa@@mysql.com}.
@item @uref{http://www.mysql.com/Contrib/mrtg-mysql-1.0.tar.gz, mrtg-mysql-1.0.tar.gz}
@strong{MySQL} status plotting with MRTG, by Luuk de Boer, @email{luuk@@wxs.nl}.
......@@ -33268,7 +33268,7 @@ The @file{libmysql.dll} library.
Mysqlmanager, a Win32 GUI tool for administrating @strong{MySQL}.
@item Curt Sampson @email{cjs@@portal.ca}
Porting of MIT-pthreads to NetBSD/Alpha and NetBSD 1.3/i386.
@item Sinisa Milivojevic @email{sinisa@@coresinc.com}
@item Sinisa Milivojevic @email{sinisa@@mysql.com}
Compression (with @code{zlib}) to the client/server protocol.
Perfect hashing for the lexical analyzer phase.
@item Antony T. Curtis @email{antony.curtis@@olcs.net}
Docs/manual.texi
View file @ 1271608e
......@@ -1378,8 +1378,9 @@ of @strong{MySQL} so that we could accelerate the development pace. If you
are interested in doing this, you can email @email{partner@@mysql.com} about
this!
@strong{MySQL AB} has currently 20+ people on its payroll and is growing
rapidly. @uref{http://www.mysql.com/development/team.html}.
@strong{MySQL AB} has currently 20+ people
(@uref{http://www.mysql.com/development/team.html}) on its payroll and is growing rapidly.
Our main sources of income are:
......@@ -3086,6 +3087,11 @@ If so, it may have a local mailing list, so that messages sent from
cases, please contact your system administrator to be added to or dropped
from the local @strong{MySQL} list.
If you wish to have traffic for a mailing list go to a separate mailbox in
your mail program, set up a filter based on the message headers. You can
use either the @code{List-ID:} or @code{Delivered-To:} headers to identify
list messages.
The following @strong{MySQL} mailing lists exist:
@table @code
......@@ -4422,6 +4428,12 @@ Please report bad or out-of-date mirrors to @email{webmaster@@mysql.com}.
@image{Flags/france} France [mtesa.net] @
@uref{http://mysql.mtesa.net/, WWW}
@item
@c EMAIL: mrjack@fastorama.com (MrJacK)
@image{Flags/france} France [fastorama.com, Chatenois] @
@uref{http://mysql.fastorama.com/, WWW}
@uref{ftp://ftp.fastorama.com/unix/mysql/, FTP}
@c @item
@c Not ok 20000919; Old site (Matt)
@c EMAIL: Jaakko.Hyvatti@eunet.fi
......@@ -5564,7 +5576,7 @@ shell> scripts/mysql_install_db
shell> chown -R root /usr/local/mysql
shell> chown -R mysql /usr/local/mysql/data
shell> chgrp -R mysql /usr/local/mysql
shell> chown -R root /usr/local/mysql/bin/
shell> chown -R root /usr/local/mysql/bin
shell> bin/safe_mysqld --user=mysql &
@end example
......@@ -5695,7 +5707,7 @@ directory to the user that you will run @code{mysqld} as:
@example
shell> chown -R root /usr/local/mysql
shell> chown -R mysql /usr/local/mysql/var
shell> chown -R mysql /usr/local/mysql/data
shell> chgrp -R mysql /usr/local/mysql
@end example
sql/item_func.cc
View file @ 1271608e
......@@ -1951,6 +1951,9 @@ bool Item_func_match::fix_fields(THD *thd,struct st_table_list *tlist)
List_iterator<Item> li(fields);
Item *item;
maybe_null=1;
join_key=0;
/* Why testing for const_item ? Monty */
/* I'll remove it later, but this should include modifications to
find_best and auto_close as complement to auto_init code above. SerG */
......@@ -2044,8 +2047,6 @@ bool Item_func_match::fix_index()
continue;
this->key=ft_to_key[key];
maybe_null=1;
join_key=0;
return 0;
}
......
sql/mysqld.cc
View file @ 1271608e
......@@ -1108,7 +1108,7 @@ static void start_signal_handler(void)
#elif defined(__EMX__)
static void sig_reload(int signo)
{
reload_acl_and_cache((THD*) 0,~0, (TABLE_LIST*) 0); // Flush everything
reload_acl_and_cache((THD*) 0,REFRESH_LOG, (TABLE_LIST*) 0); // Flush everything
signal(signo, SIG_ACK);
}
......
sql/share/spanish/errmsg.txt
View file @ 1271608e
/* Copyright Abandoned 1997 TCX DataKonsult AB & Monty Program KB & Detron HB
This file is public domain and comes with NO WARRANTY of any kind
Traduccion por Miguel Angel Fernandez Roiz -- LoboCom Sistemas, s.l. */
This file is public domain and comes with NO WARRANTY of any kind
Traduccion por Miguel Angel Fernandez Roiz -- LoboCom Sistemas, s.l.
From June 28, 2001 translated by Miguel Solorzano miguel@mysql.com */
"hashchk",
"isamchk",
"NO",
......@@ -46,8 +46,8 @@
"Memoria/espacio de tranpaso insuficiente",
"No puedo obtener el nombre de maquina de tu direccion",
"Protocolo erroneo",
"Access denied for user: '%-.32s@%-.64s' to database '%-.64s'",
"Access denied for user: '%-.32s@%-.64s' (Using password: %s)",
"Acceso negado para usuario: '%-.32s@%-.64s' para la base de datos '%-.64s'",
"Acceso negado para usuario: '%-.32s@%-.64s' (Usando clave: %s)",
"Base de datos no seleccionada",
"Comando desconocido",
"La columna '%-.64s' no puede ser nula",
......@@ -84,14 +84,14 @@
"%s: Apagado completado\n",
"%s: Forzando a cerrar el thread %ld usuario: '%-.64s'\n",
"No puedo crear IP socket",
"La tabla '%-.64s' no tiene indice como el usado en CREATE INDEX. Crea de nuevo la table",
"La tabla '%-.64s' no tiene indice como el usado en CREATE INDEX. Crea de nuevo la tabla",
"Los separadores de argumentos del campo no son los especificados. Comprueba el manual",
"No puedes usar longitudes de filas fijos con BLOBs. Por favor usa 'campos terminados por '.",
"El archivo '%-.64s' debe estar en el directorio de la base de datos o ser de lectura por todos",
"El archivo '%-.64s' ya existe",
"Registros: %ld Borrados: %ld Saltados: %ld Peligros: %ld",
"Registros: %ld Duplicados: %ld",
"Parte de la calve es erronea. Una parte de la calve no es una cadena o la longitud usada es tan grandecomo la parte de la clave",
"Parte de la clave es erronea. Una parte de la clave no es una cadena o la longitud usada es tan grande como la parte de la clave",
"No puede borrar todos los campos con ALTER TABLE. Usa DROP TABLE para hacerlo",
"No puedo ELIMINAR '%-.64s'. compuebe que el campo/clave existe",
"Registros: %ld Duplicados: %ld Peligros: %ld",
......@@ -99,120 +99,120 @@
"Identificador del thread: %lu desconocido",
"Tu no eres el propietario del thread%lu",
"No ha tablas usadas",
"Too many strings for column %s and SET",
"Can't generate a unique logfilename %s.(1-999)\n",
"Table '%-.64s' was locked with a READ lock and can't be updated",
"Table '%-.64s' was not locked with LOCK TABLES",
"Blob field '%-.64s' can't have a default value",
"Illegal database name '%-.64s'",
"Illegal table name '%-.64s'",
"The SELECT would examine too many records and probably take very long time. Check your WHERE and use SET OPTION SQL_BIG_SELECTS=1 if the SELECT is ok",
"Unknown error",
"Unkown procedure %s",
"Wrong parameter count to procedure %s",
"Wrong parameters to procedure %s",
"Unknown table '%-.64s' in %s",
"Field '%-.64s' specified twice",
"Invalid use of group function",
"Table '%-.64s' uses a extension that doesn't exist in this MySQL version",
"A table must have at least 1 column",
"The table '%-.64s' is full",
"Unknown character set: '%-.64s'",
"Too many tables. MySQL can only use %d tables in a join",
"Too many fields",
"Too big row size. The maximum row size, not counting blobs, is %d. You have to change some fields to blobs",
"Thread stack overrun: Used: %ld of a %ld stack. Use 'mysqld -O thread_stack=#' to specify a bigger stack if needed",
"Cross dependency found in OUTER JOIN. Examine your ON conditions",
"Column '%-.32s' is used with UNIQUE or INDEX but is not defined as NOT NULL",
"Can't load function '%-.64s'",
"Can't initialize function '%-.64s'; %-.80s",
"No paths allowed for shared library",
"Function '%-.64s' already exist",
"Can't open shared library '%-.64s' (errno: %d %s)",
"Can't find function '%-.64s' in library'",
"Function '%-.64s' is not defined",
"Host '%-.64s' is blocked because of many connection errors. Unblock with 'mysqladmin flush-hosts'",
"Host '%-.64s' is not allowed to connect to this MySQL server",
"You are using MySQL as an anonymous users and anonymous users are not allowed to change passwords",
"You must have privileges to update tables in the mysql database to be able to change passwords for others",
"Can't find any matching row in the user table",
"Rows matched: %ld Changed: %ld Warnings: %ld",
"Can't create a new thread (errno %d). If you are not out of available memory you can consult the manual for any possible OS dependent bug",
"Column count doesn't match value count at row %ld",
"Can't reopen table: '%-.64s',
"Invalid use of NULL value",
"Got error '%-.64s' from regexp",
"Mixing of GROUP columns (MIN(),MAX(),COUNT()...) with no GROUP columns is illegal if there is no GROUP BY clause",
"There is no such grant defined for user '%-.32s' on host '%-.64s'",
"%-.16s command denied to user: '%-.32s@%-.64s' for table '%-.64s'",
"%-.16s command denied to user: '%-.32s@%-.64s' for column '%-.64s' in table '%-.64s'",
"Illegal GRANT/REVOKE command. Please consult the manual which privleges can be used.",
"The host or user argument to GRANT is too long",
"Table '%-64s.%s' doesn't exist",
"There is no such grant defined for user '%-.32s' on host '%-.64s' on table '%-.64s'",
"The used command is not allowed with this MySQL version",
"Something is wrong in your syntax",
"Delayed insert thread couldn't get requested lock for table %-.64s",
"Too many delayed threads in use",
"Aborted connection %ld to db: '%-.64s' user: '%-.64s' (%s)",
"Got a packet bigger than 'max_allowed_packet'",
"Got a read error from the connection pipe",
"Got an error from fcntl()",
"Got packets out of order",
"Couldn't uncompress communication packet",
"Got an error reading communication packets"
"Got timeout reading communication packets",
"Got an error writing communication packets",
"Got timeout writing communication packets",
"Result string is longer than max_allowed_packet",
"The used table type doesn't support BLOB/TEXT columns",
"The used table type doesn't support AUTO_INCREMENT columns",
"INSERT DELAYED can't be used with table '%-.64s', because it is locked with LOCK TABLES",
"Incorrect column name '%-.100s'",
"The used table handler can't index column '%-.64s'",
"All tables in the MERGE table are not defined identically",
"Can't write, because of unique constraint, to table '%-.64s'",
"BLOB column '%-.64s' used in key specification without a key length",
"All parts of a PRIMARY KEY must be NOT NULL; If you need NULL in a key, use UNIQUE instead",
"Result consisted of more than one row",
"This table type requires a primary key",
"This version of MySQL is not compiled with RAID support",
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
"Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table",
"The handler for the table doesn't support check/repair",
"You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT",
"Got error %d during ROLLBACK",
"Got error %d during FLUSH_LOGS",
"Got error %d during CHECKPOINT",
"Aborted connection %ld to db: '%-.64s' user: '%-.32s' host: `%-.64s' (%-.64s)",
"The handler for the table does not support binary table dump",
"Binlog closed while trying to FLUSH MASTER",
"Failed rebuilding the index of dumped table '%-.64s'",
"Error from master: '%-.64s'",
"Net error reading from master",
"Net error writing to master",
"Can't find FULLTEXT index matching the column list",
"Can't execute the given command because you have active locked tables or an active transaction",
"Unknown system variable '%-.64'",
"Table '%-.64s' is marked as crashed and should be repaired",
"Table '%-.64s' is marked as crashed and last (automatic?) repair failed",
"Warning: Some non-transactional changed tables couldn't be rolled back",
"Multi-statement transaction required more than 'max_binlog_cache_size' bytes of storage. Increase this mysqld variable and try again',
"This operation cannot be performed with a running slave, run SLAVE STOP first",
"This operation requires a running slave, configure slave and do SLAVE START",
"The server is not configured as slave, fix in config file or with CHANGE MASTER TO",
"Could not initialize master info structure, check permisions on master.info",
"Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET",
"Lock wait timeout exceeded",
"The total number of locks exceeds the lock table size",
"Update locks cannot be acquired during a READ UNCOMMITTED transaction",
"DROP DATABASE not allowed while thread is holding global read lock",
"CREATE DATABASE not allowed while thread is holding global read lock",
"Error connecting to master: %-.128s",
"Error running query on master: %-.128s",
"Error in SHOW BINLOG EVENTS: %-.128s",
"Error in SHOW NEW MASTER: %-.128s",
"Muchas strings para columna %s y SET",
"No puede crear un unico archivo log %s.(1-999)\n",
"Tabla '%-.64s' fue trabada con un READ lock y no puede ser actualizada",
"Tabla '%-.64s' no fue trabada con LOCK TABLES",
"Campo Blob '%-.64s' no puede tener valores patron",
"Nombre de base de datos ilegal '%-.64s'",
"Nombre de tabla ilegal '%-.64s'",
"El SELECT puede examinar muchos registros y probablemente con mucho tiempo. Verifique tu WHERE y usa SET OPTION SQL_BIG_SELECTS=1 si el SELECT esta correcto",
"Error desconocido",
"Procedimiento desconocido %s",
"Equivocado parametro count para procedimiento %s",
"Equivocados parametros para procedimiento %s",
"Tabla desconocida '%-.64s' in %s",
"Campo '%-.64s' especificado dos veces",
"Invalido uso de función en grupo",
"Tabla '%-.64s' usa una extensión que no existe en esta MySQL versión",
"Una tabla debe tener al menos 1 columna",
"La tabla '%-.64s' está llena",
"Juego de caracteres desconocido: '%-.64s'",
"Muchas tablas. MySQL solamente puede usar %d tablas en un join",
"Muchos campos",
"Tamaño de línea muy grande. Máximo tamaño de línea, no contando blob, es %d. Tu tienes que cambiar algunos campos para blob",
"Sobrecarga de la pila de thread: Usada: %ld de una %ld pila. Use 'mysqld -O thread_stack=#' para especificar una mayor pila si necesario",
"Dependencia cruzada encontrada en OUTER JOIN. Examine su condición ON",
"Columna '%-.32s' es usada con UNIQUE o INDEX pero no está definida como NOT NULL",
"No puedo cargar función '%-.64s'",
"No puedo inicializar función '%-.64s'; %-.80s",
"No pasos permitidos para librarias conjugadas",
"Función '%-.64s' ya existe",
"No puedo abrir libraria conjugada '%-.64s' (errno: %d %s)",
"No puedo encontrar función '%-.64s' en libraria'",
"Función '%-.64s' no está definida",
"Servidor '%-.64s' está bloqueado por muchos errores de conexión. Desbloquear con 'mysqladmin flush-hosts'",
"Servidor '%-.64s' no está permitido para conectar con este servidor MySQL",
"Tu estás usando MySQL como un usuario anonimo y usuarios anonimos no tienen permiso para cambiar las claves",
"Tu debes de tener permiso para actualizar tablas en la base de datos mysql para cambiar las claves para otros",
"No puedo encontrar una línea correponsdiente en la tabla user",
"Líneas correspondientes: %ld Cambiadas: %ld Avisos: %ld",
"No puedo crear un nuevo thread (errno %d). Si tu está con falta de memoria disponible, tu puedes consultar el Manual para posibles problemas con SO",
"El número de columnas no corresponde al número en la línea %ld",
"No puedo reabrir tabla: '%-.64s',
"Invalido uso de valor NULL",
"Obtenido error '%-.64s' de regexp",
"Mezcla de columnas GROUP (MIN(),MAX(),COUNT()...) con no GROUP columnas es ilegal si no hat la clausula GROUP BY",
"No existe permiso definido para usuario '%-.32s' en el servidor '%-.64s'",
"%-.16s comando negado para usuario: '%-.32s@%-.64s' para tabla '%-.64s'",
"%-.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",
"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",
"Thread de inserción retarda no pudiendo bloquear para la tabla %-.64s",
"Muchos threads retardados en uso",
"Conexión abortada %ld para db: '%-.64s' usuario: '%-.64s' (%s)",
"Obtenido un paquete mayor que 'max_allowed_packet'",
"Obtenido un error de lectura de la conexión pipe",
"Obtenido un error de fcntl()",
"Obtenido paquetes desordenados",
"No puedo descomprimir paquetes de comunicación",
"Obtenido un error leyendo paquetes de comunicación"
"Obtenido timeout leyendo paquetes de comunicación",
"Obtenido un error de escribiendo paquetes de comunicación",
"Obtenido timeout escribiendo paquetes de comunicación",
"La string resultante es mayor que max_allowed_packet",
"El tipo de tabla usada no permite soporte para columnas BLOB/TEXT",
"El tipo de tabla usada no permite soporte para columnas AUTO_INCREMENT",
"INSERT DELAYED no puede ser usado con tablas '%-.64s', porque esta bloqueada con LOCK TABLES",
"Incorrecto nombre de columna '%-.100s'",
"El manipulador de tabla usado no puede indexar columna '%-.64s'",
"Todas las tablas en la MERGE tabla no estan definidas identicamente",
"No puedo escribir, debido al único constraint, para tabla '%-.64s'",
"Columna BLOB column '%-.64s' usada en especificación de clave sin tamaño de la clave",
"Todas las partes de un PRIMARY KEY deben ser NOT NULL; Si necesitas NULL en una clave, use UNIQUE",
"Resultado compuesto de mas que una línea",
"Este tipo de tabla necesita de una primary key",
"Esta versión de MySQL no es compilada con soporte RAID",
"Tu estás usando modo de actualización segura y tentado actualizar una tabla sin un WHERE que usa una KEY columna",
"Clave '%-.64s' no existe en la tabla '%-.64s'",
"No puedo abrir tabla",
"El manipulador de la tabla no permite soporte para check/repair",
"No tienes el permiso para ejecutar este comando en una transición",
"Obtenido error %d durante COMMIT",
"Obtenido error %d durante ROLLBACK",
"Obtenido error %d durante FLUSH_LOGS",
"Obtenido error %d durante CHECKPOINT",
"Abortada conexión %ld para db: '%-.64s' usuario: '%-.32s' servidor: `%-.64s' (%-.64s)",
"El manipulador de tabla no soporta dump para tabla binaria",
"Binlog cerrado mientras tentaba el FLUSH MASTER",
"Falla reconstruyendo el indice de la tabla dumped '%-.64s'",
"Error del master: '%-.64s'",
"Error de red leyendo del master",
"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'",
"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",
"Multipla transición necesita mas que 'max_binlog_cache_size' bytes de almacenamiento. Aumente esta variable mysqld y tente de nuevo',
"Esta operación no puede ser hecha con el esclavo funcionando, primero use SLAVE STOP",
"Esta operación necesita el esclavo funcionando, configure esclavo y haga el SLAVE START",
"El servidor no está configurado como esclavo, edite el archivo config file o con CHANGE MASTER TO",
"No puedo inicializar la estructura info del master, verifique permisiones en el master.info",
"No puedo crear el thread esclavo, verifique recursos del sistema",
"Usario %-.64s ya tiene mas que 'max_user_connections' conexiones activas",
"Tu solo debes usar expresiones constantes con SET",
"Tiempo de bloqueo de espera excedido",
"El número total de bloqueos excede el tamaño de bloqueo de la tabla",
"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",
"Error de coneccion a master: %-128s",
"Error executando el query en master: %-128%",
"Error de SHOW BINLOG EVENTS: %-128%",
"Error de SHOW NEW MASTER: %-128%",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7