Commit 7ad755e7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/hf/work/mysql-5.0.19672 

into mysql.com:/home/hf/work/mysql-5.1.clean


mysys/my_init.c:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
parents 17f724a1 c072416c

mysys/my_init.c

+23 −1
Original line number Diff line number Diff line
@@ -246,6 +246,22 @@ void setEnvString(char *ret, const char *name, const char *value) 
  DBUG_VOID_RETURN ;

}



/*

  my_paramter_handler

  Invalid paramter handler we will use instead of the one "baked" into the CRT

  for MSC v8.  This one just prints out what invalid parameter was encountered.

  By providing this routine, routines like lseek will return -1 when we expect them 

  to instead of crash.

*/

void my_parameter_handler(const wchar_t * expression, const wchar_t * function, 

                          const wchar_t * file, unsigned int line, 

                          uintptr_t pReserved)

{

  DBUG_PRINT("my",("Expression: %s  function: %s  file: %s, line: %d",

		   expression, function, file, line));

}





static void my_win_init(void)

{

  HKEY	hSoftMysql ;
@@ -263,12 +279,18 @@ static void my_win_init(void) 


  setlocale(LC_CTYPE, "");             /* To get right sortorder */



#if defined(_MSC_VER) && (_MSC_VER < 1300)

#if defined(_MSC_VER)

#if _MSC_VER < 1300

  /* 

    Clear the OS system variable TZ and avoid the 100% CPU usage

    Only for old versions of Visual C++

  */

  _putenv( "TZ=" ); 

#endif 

#if _MSC_VER >= 1400

  /* this is required to make crt functions return -1 appropriately */

  _set_invalid_parameter_handler(my_parameter_handler);

#endif

#endif  

  _tzset();

sql/share/errmsg.txt

+13 −13
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ ER_CANT_CREATE_FILE 
	cze "Nemohu vytvo-Bit soubor '%-.64s' (chybov kd: %d)"

	dan "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)"

	nla "Kan file '%-.64s' niet aanmaken (Errcode: %d)"

	eng "Can't create file '%-.64s' (errno: %d)"

	eng "Can't create file '%-.200s' (errno: %d)"

	est "Ei suuda luua faili '%-.64s' (veakood: %d)"

	fre "Ne peut crer le fichier '%-.64s' (Errcode: %d)"

	ger "Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)"
@@ -278,7 +278,7 @@ ER_CANT_GET_STAT 
	cze "Nemohu z-Bskat stav '%-.64s' (chybov kd: %d)"

	dan "Kan ikke lse status af '%-.64s' (Fejlkode: %d)"

	nla "Kan de status niet krijgen van '%-.64s' (Errcode: %d)"

	eng "Can't get status of '%-.64s' (errno: %d)"

	eng "Can't get status of '%-.200s' (errno: %d)"

	jps "'%-.64s' ̃XeC^X܂. (errno: %d)",

	est "Ei suuda lugeda '%-.64s' olekut (veakood: %d)"

	fre "Ne peut obtenir le status de '%-.64s' (Errcode: %d)"
@@ -353,7 +353,7 @@ ER_CANT_OPEN_FILE 
	cze "Nemohu otev-Bt soubor '%-.64s' (chybov kd: %d)"

	dan "Kan ikke bne fil: '%-.64s' (Fejlkode: %d)"

	nla "Kan de file '%-.64s' niet openen (Errcode: %d)"

	eng "Can't open file: '%-.64s' (errno: %d)"

	eng "Can't open file: '%-.200s' (errno: %d)"

	jps "'%-.64s' t@CJł܂ (errno: %d)",

	est "Ei suuda avada faili '%-.64s' (veakood: %d)"

	fre "Ne peut ouvrir le fichier: '%-.64s' (Errcode: %d)"
@@ -378,7 +378,7 @@ ER_FILE_NOT_FOUND 
	cze "Nemohu naj-Bt soubor '%-.64s' (chybov kd: %d)"

	dan "Kan ikke finde fila: '%-.64s' (Fejlkode: %d)"

	nla "Kan de file: '%-.64s' niet vinden (Errcode: %d)"

	eng "Can't find file: '%-.64s' (errno: %d)"

	eng "Can't find file: '%-.200s' (errno: %d)"

	jps "'%-.64s' t@Ct鎖ł܂.(errno: %d)",

	est "Ei suuda leida faili '%-.64s' (veakood: %d)"

	fre "Ne peut trouver le fichier: '%-.64s' (Errcode: %d)"
@@ -549,7 +549,7 @@ ER_ERROR_ON_READ 
	cze "Chyba p-Bi ten souboru '%-.64s' (chybov kd: %d)"

	dan "Fejl ved lsning af '%-.64s' (Fejlkode: %d)"

	nla "Fout bij het lezen van file '%-.64s' (Errcode: %d)"

	eng "Error reading file '%-.64s' (errno: %d)"

	eng "Error reading file '%-.200s' (errno: %d)"

	jps "'%-.64s' t@C̓ǂݍ݃G[ (errno: %d)",

	est "Viga faili '%-.64s' lugemisel (veakood: %d)"

	fre "Erreur en lecture du fichier '%-.64s' (Errcode: %d)"
@@ -599,7 +599,7 @@ ER_ERROR_ON_WRITE 
	cze "Chyba p-Bi zpisu do souboru '%-.64s' (chybov kd: %d)"

	dan "Fejl ved skriving av filen '%-.64s' (Fejlkode: %d)"

	nla "Fout bij het wegschrijven van file '%-.64s' (Errcode: %d)"

	eng "Error writing file '%-.64s' (errno: %d)"

	eng "Error writing file '%-.200s' (errno: %d)"

	jps "'%-.64s' t@Cł܂ (errno: %d)",

	est "Viga faili '%-.64s' kirjutamisel (veakood: %d)"

	fre "Erreur d'criture du fichier '%-.64s' (Errcode: %d)"
@@ -772,7 +772,7 @@ ER_NOT_FORM_FILE 
	cze "Nespr-Bvn informace v souboru '%-.64s'"

	dan "Forkert indhold i: '%-.64s'"

	nla "Verkeerde info in file: '%-.64s'"

	eng "Incorrect information in file: '%-.64s'"

	eng "Incorrect information in file: '%-.200s'"

	jps "t@C '%-.64s'  info ԈĂ悤ł",

	est "Vigane informatsioon failis '%-.64s'"

	fre "Information erronne dans le fichier: '%-.64s'"
@@ -797,7 +797,7 @@ ER_NOT_KEYFILE 
	cze "Nespr-Bvn kl pro tabulku '%-.64s'; pokuste se ho opravit"

	dan "Fejl i indeksfilen til tabellen '%-.64s'; prv at reparere den"

	nla "Verkeerde zoeksleutel file voor tabel: '%-.64s'; probeer het te repareren"

	eng "Incorrect key file for table '%-.64s'; try to repair it"

	eng "Incorrect key file for table '%-.200s'; try to repair it"

	jps "'%-.64s' e[u key file ԈĂ悤ł. CĂ",

	est "Tabeli '%-.64s' vtmefail on vigane; proovi seda parandada"

	fre "Index corrompu dans la table: '%-.64s'; essayez de le rparer"
@@ -2044,7 +2044,7 @@ ER_TEXTFILE_NOT_READABLE 
	cze "Soubor '%-.64s' mus-B bt v adresi databze nebo iteln pro vechny"

	dan "Filen '%-.64s' skal vre i database-folderen og kunne lses af alle"

	nla "Het bestand '%-.64s' dient in de database directory voor the komen of leesbaar voor iedereen te zijn."

	eng "The file '%-.64s' must be in the database directory or be readable by all"

	eng "The file '%-.128s' must be in the database directory or be readable by all"

	jps "t@C '%-.64s'  databse  directory ɂ邩SẴ[U[ǂ߂悤ɋ‚ĂȂ΂Ȃ܂.",

	est "Fail '%-.64s' peab asuma andmebaasi kataloogis vi olema kigile loetav"

	fre "Le fichier '%-.64s' doit tre dans le rpertoire de la base et lisible par tous"
@@ -2069,7 +2069,7 @@ ER_FILE_EXISTS_ERROR 
	cze "Soubor '%-.64s' ji-B existuje"

	dan "Filen '%-.64s' eksisterer allerede"

	nla "Het bestand '%-.64s' bestaat reeds"

	eng "File '%-.80s' already exists"

	eng "File '%-.200s' already exists"

	jps "File '%-.64s' ͊ɑ݂܂",

	est "Fail '%-.80s' juba eksisteerib"

	fre "Le fichier '%-.64s' existe dj"
@@ -2345,7 +2345,7 @@ ER_NO_UNIQUE_LOGFILE 
	cze "Nemohu vytvo-Bit jednoznan jmno logovacho souboru %s.(1-999)\n"

	dan "Kan ikke lave unikt log-filnavn %s.(1-999)\n"

	nla "Het is niet mogelijk een unieke naam te maken voor de logfile %s.(1-999)\n"

	eng "Can't generate a unique log-filename %-.64s.(1-999)\n"

	eng "Can't generate a unique log-filename %-.200s.(1-999)\n"

	est "Ei suuda luua unikaalset logifaili nime %-.64s.(1-999)\n"

	fre "Ne peut gnrer un unique nom de journal %s.(1-999)\n"

	ger "Kann keinen eindeutigen Dateinamen fr die Logdatei %-.64s(1-999) erzeugen\n"
@@ -5193,7 +5193,7 @@ ER_FPARSER_BAD_HEADER 
	rus "    '%-.64s'"

	ukr "צ    ̦ '%-.64s'"

ER_FPARSER_EOF_IN_COMMENT  

	eng "Unexpected end of file while parsing comment '%-.64s'"

	eng "Unexpected end of file while parsing comment '%-.200s'"

	ger "Unerwartetes Dateiende beim Parsen des Kommentars '%-.64s'"

	rus "     '%-.64s'"

	ukr "Ħ ˦   Ҧ '%-.64s'"
@@ -5362,7 +5362,7 @@ ER_LOGGING_PROHIBIT_CHANGING_OF 
	eng "Binary logging and replication forbid changing the global server %s"

	ger "Binrlogs und Replikation verhindern Wechsel des globalen Servers %s"

ER_NO_FILE_MAPPING  

	eng "Can't map file: %-.64s, errno: %d"

	eng "Can't map file: %-.200s, errno: %d"

	ger "Kann Datei nicht abbilden: %-.64s, Fehler: %d"

ER_WRONG_MAGIC  

	eng "Wrong magic in %-.64s"