mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
merge to 3.23.51
Docs/glibc-2.2.5.patch: Auto merged strings/longlong2str-x86.s: Auto merged strings/strings-x86.s: Auto merged
This commit is contained in:
unknown
commit
733d883760
5 changed files with 129 additions and 100 deletions
|
|
@ -52,7 +52,7 @@ diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nssw
|
|||
while (isspace (line[0]))
|
||||
++line;
|
||||
***************
|
||||
*** 510,522 ****
|
||||
522
|
||||
if (name == line)
|
||||
return result;
|
||||
|
||||
|
|
@ -86,7 +86,7 @@ diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nssw
|
|||
if (new_service == NULL)
|
||||
return result;
|
||||
|
||||
! *((char *) __mempcpy (new_service->name, name, name_alloc_len)) = '\0';
|
||||
! *((char *) __mempcpy (new_service->name, name, name_alloc_len-1)) = '\0';
|
||||
|
||||
/* Set default actions. */
|
||||
new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ EXTRA_DIST = INSTALL-SOURCE README \
|
|||
SUBDIRS = include @docs_dirs@ @readline_dir@ \
|
||||
@thread_dirs@ pstack @sql_client_dirs@ \
|
||||
@sql_server_dirs@ @libmysqld_dirs@ scripts man \
|
||||
tests BUILD \
|
||||
tests BUILD os2 \
|
||||
@bench_dirs@ support-files @fs_dirs@ @tools_dirs@
|
||||
|
||||
# Relink after clean
|
||||
|
|
|
|||
|
|
@ -2364,7 +2364,7 @@ AC_OUTPUT(Makefile extra/Makefile mysys/Makefile isam/Makefile \
|
|||
myisam/Makefile myisammrg/Makefile \
|
||||
man/Makefile BUILD/Makefile readline/Makefile vio/Makefile \
|
||||
libmysql_r/Makefile libmysqld/Makefile libmysqld/examples/Makefile \
|
||||
libmysql/Makefile client/Makefile \
|
||||
libmysql/Makefile client/Makefile os2/Makefile \
|
||||
pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile \
|
||||
merge/Makefile dbug/Makefile scripts/Makefile \
|
||||
include/Makefile sql-bench/Makefile tools/Makefile \
|
||||
|
|
|
|||
29
os2/Makefile.am
Normal file
29
os2/Makefile.am
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# Copyright (C) 2002 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
EXTRA_DIST = BldLevel.cmd BldLevel.rc BldLevelInf.cmd ChangeLog.os2 \
|
||||
MySQL-All.icc MySQL-Client.icc MySQL-Client.irs \
|
||||
MySQL-Lib.icc MySQL-Opt.icc MySQL-ReadLine.icc \
|
||||
MySQL-Source.icc MySQL-Sql.icc MySQL-Util.icc MySQL-Util.irs \
|
||||
MySQL-binlog.icc MySQL-binlog.irs MySQL-sql.irs ReadMe.txt \
|
||||
build-all.cmd build-all.log mysql-inf.wis mysql.base \
|
||||
mysql.ih mysql.wis mysqlalt.wis readme.os2 rint.cmd rint.obj \
|
||||
rint.s
|
||||
|
||||
# Don't update the files from bitkeeper
|
||||
%::SCCS/s.%
|
||||
|
|
@ -122,103 +122,103 @@
|
|||
"Ligne trop grande. Le taille maximale d'une ligne, sauf les BLOBs, est %d. Changez le type de quelques colonnes en BLOB",
|
||||
"Débordement de la pile des tâches (Thread stack). Utilisées: %ld pour une pile de %ld. Essayez 'mysqld -O thread_stack=#' pour indiquer une plus grande valeur",
|
||||
"Dépendance croisée dans une clause OUTER JOIN. Vérifiez la condition ON",
|
||||
"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",
|
||||
"La colonne '%-.32s' fait partie d'un index UNIQUE ou INDEX mais n'est pas définie comme NOT NULL"
|
||||
"Imposible de charger la fonction '%-.64s'",
|
||||
"Impossible d'initialiser la fonction '%-.64s'; %-.80s",
|
||||
"Chemin interdit pour les bibliothèques partagées",
|
||||
"La fonction '%-.64s' existe déjà",
|
||||
"Impossible d'ouvrir la bibliothèque partagée '%-.64s' (errno: %d %s)",
|
||||
"Impossible de trouver la fonction '%-.64s' dans la bibliothèque'",
|
||||
"La fonction '%-.64s' n'est pas définie",
|
||||
"L'hôte '%-.64s' est bloqué à cause d'un trop grand nombre d'erreur de connection. Débloquer le par 'mysqladmin flush-hosts'",
|
||||
"Le hôte '%-.64s' n'est pas authorisé à se connecter à ce serveur MySQL",
|
||||
"Vous utilisez un utilisateur anonyme et les utilisateurs anonymes ne sont pas autorisés à changer les mots de passe",
|
||||
"Vous devez avoir le privilège update sur les tables de la base de donnée mysql pour pouvoir changer les mots de passe des autres",
|
||||
"Impossible de trouver un enregistrement correspondant dans la table user",
|
||||
"Enregistrements correspondants: %ld Modifiés: %ld Warnings: %ld",
|
||||
"Impossible de créer une nouvelle tâche (errno %d). S'il reste de la mémoire libre, consultez le manual pour trouver un éventuel bug dépendant de l'OS",
|
||||
"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 '%-.64s'",
|
||||
"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",
|
||||
"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",
|
||||
"Impossible de réouvrir la table: '%-.64s',
|
||||
"Utilisation incorrecte de la valeur NULL",
|
||||
"Erreur '%-.64s' provenant de regexp",
|
||||
"Mélanger les colonnes GROUP (MIN(),MAX(),COUNT()...) avec des colonnes normales est interdit s'il n'y a pas de clause GROUP BY",
|
||||
"Un tel droit n'est pas défini pour l'utilisateur '%-.32s' sur l'hôte '%-.64s'",
|
||||
"La commande '%-.16s' est interdite à l'utilisateur: '%-.32s@%-.64s' sur la table '%-.64s'",
|
||||
"La commande '%-.16s' est interdite à l'utilisateur: '%-.32s@%-.64s' sur la colonne '%-.64s' de la table '%-.64s'",
|
||||
"Commande GRANT/REVOKE incorrecte. Consultez le manuel.",
|
||||
"L'hôte ou l'utilisateur donné en argument à GRANT est trop long",
|
||||
"La table '%-64s.%s' n'existe pas",
|
||||
"Un tel droit n'est pas défini pour l'utilisateur '%-.32s' sur l'hôte '%-.64s' sur la table '%-.64s'",
|
||||
"Cette commande n'existe pas dans cette version de MySQL",
|
||||
"Erreur de syntaxe",
|
||||
"La tâche 'delayed insert' n'a pas pu obtenir le verrou démandé sur la table %-.64s",
|
||||
"Trop de tâche 'delayed' en cours",
|
||||
"Connection %ld avortée vers la bd: '%-.64s' utilisateur: '%-.64s' (%s)",
|
||||
"Paquet plus grand que 'max_allowed_packet' reçu",
|
||||
"Erreur de lecture reçue du pipe de connection",
|
||||
"Erreur reçue de fcntl() ",
|
||||
"Paquets reçus dans le désordre",
|
||||
"Impossible de décompresser le paquet reçu",
|
||||
"Erreur de lecture des paquets reçus"
|
||||
"Timeout en lecture des paquets reçus",
|
||||
"Erreur d'écriture des paquets envoyés",
|
||||
"Timeout d'écriture des paquets envoyés",
|
||||
"La chaîne résultat est plus grande que max_allowed_packet",
|
||||
"Ce type de table ne supporte pas les colonnes BLOB/TEXT",
|
||||
"Ce type de table ne supporte pas les colonnes AUTO_INCREMENT",
|
||||
"INSERT DELAYED ne peut être utilisé avec la table '%-.64s', car elle est verrouée avec LOCK TABLES",
|
||||
"Nom de colonne '%-.100s' incorrect",
|
||||
"Le handler de la table ne peut indexé la colonne '%-.64s'",
|
||||
"Toutes les tables de la table de type MERGE n'ont pas la même définition",
|
||||
"Écriture impossible à cause d'un index UNIQUE sur la table '%-.64s'",
|
||||
"La colonne '%-.64s' de type BLOB est utilisée dans une définition d'index sans longueur d'index",
|
||||
"Toutes les parties d'un index PRIMARY KEY doivent être NOT NULL; Si vous avez besoin d'un NULL dans l'index, utilisez un index UNIQUE",
|
||||
"Le résultat contient plus d'un enregistrement",
|
||||
"Ce type de table nécessite une clé primaire (PRIMARY KEY)",
|
||||
"Cette version de MySQL n'est pas compilée avec le support RAID",
|
||||
"Vous êtes en mode 'safe update' et vous essayez de faire un UPDATE sans clause WHERE utilisant un index",
|
||||
"L'index '%-.64s' n'existe pas sur la table '%-.64s'",
|
||||
"Impossible d'ouvrir la table",
|
||||
"Ce type de table ne supporte pas les check/repair",
|
||||
"Vous n'êtes pas autorisé à exécute cette commande dans une transaction",
|
||||
"Erreur %d lors du COMMIT",
|
||||
"Erreur %d lors du ROLLBACK",
|
||||
"Erreur %d lors du FLUSH_LOGS",
|
||||
"Erreur %d lors du CHECKPOINT",
|
||||
"Connection %ld avortée vers la bd: '%-.64s' utilisateur: '%-.32s' hôte: `%-.64s' (%-.64s)",
|
||||
"Ce type de table ne supporte pas les copies binaires",
|
||||
"Le 'binlog' a été fermé pendant l'exécution du FLUSH MASTER",
|
||||
"La reconstruction de l'index de la table copiée '%-.64s' a échoué",
|
||||
"Erreur reçue du maître: '%-.64s'",
|
||||
"Erreur de lecture réseau reçue du maître",
|
||||
"Erreur d'écriture réseau reçue du maître",
|
||||
"Impossible de trouver un index FULLTEXT correspondant à cette liste de colonnes",
|
||||
"Impossible d'exécuter la commande car vous avez des tables verrouillées ou une transaction active",
|
||||
"Variable système '%-.64' inconnue",
|
||||
"La table '%-.64s' est marquée 'crashed' et devrait être réparée",
|
||||
"La table '%-.64s' est marquée 'crashed' et le dernier 'repair' a échoué",
|
||||
"Attention: certaines tables ne supportant pas les transactions ont été changées et elles ne pourront pas être restituées",
|
||||
"Cette transaction à commandes multiples nécessite plus de 'max_binlog_cache_size' octets de stockage, augmentez cette variable de mysqld et réessayez',
|
||||
"Cette opération ne peut être réalisée avec un esclave actif, faites SLAVE STOP d'abord",
|
||||
"Cette opération nécessite un esclave actif, configurez les esclaves et faites SLAVE START",
|
||||
"Le server n'est pas configuré comme un esclave, changez le fichier de configuration ou utilisez CHANGE MASTER TO",
|
||||
"Impossible d'initialiser les structures d'information de maître, vérifiez les permissions sur master.info",
|
||||
"Impossible de créer une tâche esclave, vérifiez les ressources système",
|
||||
"L'utilisateur %-.64s possède déjà plus de 'max_user_connections' connections actives",
|
||||
"Seules les expressions constantes sont autorisées avec SET",
|
||||
"Timeout sur l'obtention du verrou",
|
||||
"Le nombre total de verrou dépasse la taille de la table des verrous",
|
||||
"Un verrou en update ne peut être acquit pendant une transaction READ UNCOMMITTED",
|
||||
"DROP DATABASE n'est pas autorisée pendant qu'une tâche possède un verrou global en lecture",
|
||||
"CREATE DATABASE n'est pas autorisée pendant qu'une tâche possède un verrou global en lecture",
|
||||
"Mauvais arguments à %s",
|
||||
"%-.32s@%-.64s n'est pas autorisé à créer de nouveaux utilisateurs",
|
||||
"Définition de table incorrecte : toutes les tables MERGE doivent être dans la même base de donnée",
|
||||
"Deadlock découvert en essayant d'obtenir les verrous : essayez de redémarrer la transaction",
|
||||
"Le type de table utilisé ne supporte pas les index FULLTEXT",
|
||||
"Impossible d'ajouter des contraintes d'index externe",
|
||||
"Impossible d'ajouter un enregistrement fils : une constrainte externe l'empèche",
|
||||
"Impossible de supprimer un enregistrement père : une constrainte externe l'empèche",
|
||||
"Error connecting to master: %-.128s",
|
||||
"Error running query on master: %-.128s",
|
||||
"Error when executing command %s: %-.128s",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue