Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

into deer.(none):/home/hf/work/mysql-4.1.2way

mysql-test/r/alter_table.result

@@ -281,3 +281,42 @@ ALTER TABLE t1 DISABLE KEYS;
 INSERT DELAYED INTO t1 VALUES(1),(2),(3);
 ALTER TABLE t1 ENABLE KEYS;
 drop table t1;
+set names koi8r;
+create table t1 (a char(10) character set koi8r);
+insert into t1 values ('ÔÅÓÔ');
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	D4C5D3D4
+alter table t1 change a a char(10) character set cp1251;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	F2E5F1F2
+alter table t1 change a a char(10) binary;
+select a,hex(a) from t1;
+a	hex(a)
+òåñò	F2E5F1F2
+alter table t1 change a a char(10) character set cp1251;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	F2E5F1F2
+alter table t1 change a a char(10) character set koi8r;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	D4C5D3D4
+alter table t1 change a a varchar(10) character set cp1251;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	F2E5F1F2
+alter table t1 change a a char(10) character set koi8r;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	D4C5D3D4
+alter table t1 change a a text character set cp1251;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	F2E5F1F2
+alter table t1 change a a char(10) character set koi8r;
+select a,hex(a) from t1;
+a	hex(a)
+ÔÅÓÔ	D4C5D3D4
+drop table t1;

mysql-test/r/case.result

@@ -71,3 +71,24 @@ orange
 yellow
 green
 drop table t1;
+SET NAMES latin1;
+CREATE TABLE t1 SELECT COALESCE(_latin1'a',_latin2'a');
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,COERCIBLE) and (latin2_general_ci,COERCIBLE) for operation 'coalesce'
+CREATE TABLE t1 SELECT COALESCE('a' COLLATE latin1_swedish_ci,'b' COLLATE latin1_bin);
+ERROR HY000: Illegal mix of collations (latin1_swedish_ci,EXPLICIT) and (latin1_bin,EXPLICIT) for operation 'coalesce'
+CREATE TABLE t1 SELECT 
+COALESCE(1), COALESCE(1.0),COALESCE('a'),
+COALESCE(1,1.0), COALESCE(1,'1'),COALESCE(1.1,'1'),
+COALESCE('a' COLLATE latin1_bin,'b');
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `COALESCE(1)` int(1) NOT NULL default '0',
+  `COALESCE(1.0)` double(3,1) NOT NULL default '0.0',
+  `COALESCE('a')` char(1) NOT NULL default '',
+  `COALESCE(1,1.0)` double(3,1) NOT NULL default '0.0',
+  `COALESCE(1,'1')` char(1) NOT NULL default '',
+  `COALESCE(1.1,'1')` char(3) NOT NULL default '',
+  `COALESCE('a' COLLATE latin1_bin,'b')` char(1) character set latin1 collate latin1_bin NOT NULL default ''
+) TYPE=MyISAM CHARSET=latin1
+DROP TABLE t1;

mysql-test/r/func_str.result

@@ -532,3 +532,24 @@ t1	CREATE TABLE `t1` (
   `replace(_latin2'abcd',_latin2'b',_latin2'B')` char(4) character set latin2 NOT NULL default ''
 ) TYPE=MyISAM CHARSET=latin1
 drop table t1;
+select SUBSTR('abcdefg',3,2);
+SUBSTR('abcdefg',3,2)
+cd
+select SUBSTRING('abcdefg',3,2);
+SUBSTRING('abcdefg',3,2)
+cd
+select SUBSTR('abcdefg',-3,2) FROM DUAL;
+SUBSTR('abcdefg',-3,2)
+ef
+select SUBSTR('abcdefg',-1,5) FROM DUAL;
+SUBSTR('abcdefg',-1,5)
+g
+select SUBSTR('abcdefg',0,0) FROM DUAL;
+SUBSTR('abcdefg',0,0)
+
+select SUBSTR('abcdefg',-1,-1) FROM DUAL;
+SUBSTR('abcdefg',-1,-1)
+
+select SUBSTR('abcdefg',1,-1) FROM DUAL;
+SUBSTR('abcdefg',1,-1)
+

mysql-test/t/alter_table.test

@@ -144,3 +144,30 @@ ALTER TABLE t1 DISABLE KEYS;
 INSERT DELAYED INTO t1 VALUES(1),(2),(3);
 ALTER TABLE t1 ENABLE KEYS;
 drop table t1;
+
+#
+# Test that data get converted when character set is changed
+# Test that data doesn't get converted when src or dst is BINARY/BLOB
+#
+set names koi8r;
+create table t1 (a char(10) character set koi8r);
+insert into t1 values ('ÔÅÓÔ');
+select a,hex(a) from t1;
+alter table t1 change a a char(10) character set cp1251;
+select a,hex(a) from t1;
+alter table t1 change a a char(10) binary;
+select a,hex(a) from t1;
+alter table t1 change a a char(10) character set cp1251;
+select a,hex(a) from t1;
+alter table t1 change a a char(10) character set koi8r;
+select a,hex(a) from t1;
+alter table t1 change a a varchar(10) character set cp1251;
+select a,hex(a) from t1;
+alter table t1 change a a char(10) character set koi8r;
+select a,hex(a) from t1;
+alter table t1 change a a text character set cp1251;
+select a,hex(a) from t1;
+alter table t1 change a a char(10) character set koi8r;
+select a,hex(a) from t1;
+
+drop table t1;

mysql-test/t/case.test

@@ -41,3 +41,25 @@ create table t1 (row int not null, col int not null, val varchar(255) not null);
 insert into t1 values (1,1,'orange'),(1,2,'large'),(2,1,'yellow'),(2,2,'medium'),(3,1,'green'),(3,2,'small');
 select max(case col when 1 then val else null end) as color from t1 group by row;
 drop table t1;
+
+#
+# COALESCE is a CASE abbrevation:
+#
+# COALESCE(v1,v2) == CASE WHEN v1 IS NOT NULL THEN v1 ELSE v2 END
+#
+# COALESCE(V1, V2, . . . ,Vn ) =  
+#     CASE WHEN V1 IS NOT NULL THEN V1 ELSE COALESCE (V2, . . . ,Vn) END
+#
+# Check COALESCE argument types aggregation
+
+SET NAMES latin1;
+--error 1265
+CREATE TABLE t1 SELECT COALESCE(_latin1'a',_latin2'a');
+--error 1265
+CREATE TABLE t1 SELECT COALESCE('a' COLLATE latin1_swedish_ci,'b' COLLATE latin1_bin);
+CREATE TABLE t1 SELECT 
+ COALESCE(1), COALESCE(1.0),COALESCE('a'),
+ COALESCE(1,1.0), COALESCE(1,'1'),COALESCE(1.1,'1'),
+ COALESCE('a' COLLATE latin1_bin,'b');
+SHOW CREATE TABLE t1;
+DROP TABLE t1;

mysql-test/t/func_str.test

@@ -294,3 +294,14 @@ select
 ;
 show create table t1;
 drop table t1;
+
+#
+# test for SUBSTR
+#
+select SUBSTR('abcdefg',3,2);
+select SUBSTRING('abcdefg',3,2);
+select SUBSTR('abcdefg',-3,2) FROM DUAL;
+select SUBSTR('abcdefg',-1,5) FROM DUAL;
+select SUBSTR('abcdefg',0,0) FROM DUAL;
+select SUBSTR('abcdefg',-1,-1) FROM DUAL;
+select SUBSTR('abcdefg',1,-1) FROM DUAL;

sql/item_cmpfunc.cc

@@ -1149,7 +1149,13 @@ void Item_func_coalesce::fix_length_and_dec()
   {
     set_if_bigger(max_length,args[i]->max_length);
     set_if_bigger(decimals,args[i]->decimals);
+    cached_result_type=item_store_type(cached_result_type,
+				       args[i]->result_type());
   }
+  if (cached_result_type == STRING_RESULT)
+    agg_arg_collations(collation, args, arg_count);
+  else if (cached_result_type != REAL_RESULT)
+    decimals= 0;
 }
 
 /****************************************************************************

sql/item_strfunc.cc

@@ -979,13 +979,14 @@ void Item_func_right::fix_length_and_dec()
 String *Item_func_substr::val_str(String *str)
 {
   String *res  = args[0]->val_str(str);
-  int32 start	= (int32) args[1]->val_int()-1;
+  int32 start	= (int32) args[1]->val_int();
   int32 length	= arg_count == 3 ? (int32) args[2]->val_int() : INT_MAX32;
   int32 tmp_length;
 
   if ((null_value=(args[0]->null_value || args[1]->null_value ||
 		   (arg_count == 3 && args[2]->null_value))))
     return 0; /* purecov: inspected */
+  start= (int32)((start < 0) ? res->length() + start : start -1);
   start=res->charpos(start);
   length=res->charpos(length,start);
   if (start < 0 || (uint) start+1 > res->length() || length <= 0)

sql/lex.h

@@ -627,6 +627,7 @@ static SYMBOL sql_functions[] = {
   { "STD",		SYM(STD_SYM),0,0},
   { "STDDEV",		SYM(STD_SYM),0,0},
   { "STRCMP",		SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_strcmp)},
+  { "SUBSTR",	  	SYM(SUBSTRING),0,0},
   { "SUBSTRING",	SYM(SUBSTRING),0,0},
   { "SUBSTRING_INDEX",	SYM(SUBSTRING_INDEX),0,0},
   { "SUBTIME",          SYM(FUNC_ARG2),0,CREATE_FUNC(create_func_subtime)},

sql/share/czech/errmsg.txt

@@ -16,7 +16,7 @@ v/*
 "ANO",
 "Nemohu vytvo-Bøit soubor '%-.64s' (chybový kód: %d)",
 "Nemohu vytvo-Bøit tabulku '%-.64s' (chybový kód: %d)",
-"Nemohu vytvo-Bøit databázi '%-.64s', chyba %d",
+"Nemohu vytvo-Bøit databázi '%-.64s' (chybový kód: %d)",
 "Nemohu vytvo-Bøit databázi '%-.64s'; databáze ji¾ existuje",
 "Nemohu zru-B¹it databázi '%-.64s', databáze neexistuje",
 "Chyba p-Bøi ru¹ení databáze (nemohu vymazat '%-.64s', chyba %d)",
@@ -222,7 +222,7 @@ v/*
 "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",
+"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",

sql/share/danish/errmsg.txt

@@ -10,7 +10,7 @@
 "JA",
 "Kan ikke oprette filen '%-.64s' (Fejlkode: %d)",
 "Kan ikke oprette tabellen '%-.64s' (Fejlkode: %d)",
-"Kan ikke oprette databasen '%-.64s'. Fejl %d",
+"Kan ikke oprette databasen '%-.64s' (Fejlkode: %d)",
 "Kan ikke oprette databasen '%-.64s'; databasen eksisterer",
 "Kan ikke slette (droppe) '%-.64s'; databasen eksisterer ikke",
 "Fejl ved sletning (drop) af databasen (kan ikke slette '%-.64s', Fejl %d)",
@@ -216,7 +216,7 @@
 "CREATE DATABASE er ikke tilladt mens en tråd holder på globalt 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",
+"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",

sql/share/dutch/errmsg.txt

@@ -224,7 +224,7 @@
 "CREATE DATABASE niet toegestaan terwijl thread een globale 'read lock' bezit",
 "Foutieve parameters voor %s",
 "%-.32s@%-.64s mag geen nieuwe gebruikers creeren",
-"Incorrecte tabel definitie; Alle MERGE tabellen moeten tot dezelfde database behoren",
+"Incorrecte tabel definitie; alle MERGE tabellen moeten tot dezelfde database behoren",
 "Deadlock gevonden tijdens lock-aanvraag poging; Probeer herstart van de transactie",
 "Het gebruikte tabel type ondersteund geen FULLTEXT indexen",
 "Kan foreign key beperking niet toevoegen",

sql/share/english/errmsg.txt

@@ -7,7 +7,7 @@
 "YES",
 "Can't create file '%-.64s' (errno: %d)",
 "Can't create table '%-.64s' (errno: %d)",
-"Can't create database '%-.64s'. (errno: %d)",
+"Can't create database '%-.64s' (errno: %d)",
 "Can't create database '%-.64s'; database exists",
 "Can't drop database '%-.64s'; database doesn't exist",
 "Error dropping database (can't delete '%-.64s', errno: %d)",
@@ -213,7 +213,7 @@
 "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",
+"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",

sql/share/estonian/errmsg.txt

@@ -12,7 +12,7 @@
 "JAH",
 "Ei suuda luua faili '%-.64s' (veakood: %d)",
 "Ei suuda luua tabelit '%-.64s' (veakood: %d)",
-"Ei suuda luua andmebaasi '%-.64s'. (veakood: %d)",
+"Ei suuda luua andmebaasi '%-.64s' (veakood: %d)",
 "Ei suuda luua andmebaasi '%-.64s': andmebaas juba eksisteerib",
 "Ei suuda kustutada andmebaasi '%-.64s': andmebaasi ei eksisteeri",
 "Viga andmebaasi kustutamisel (ei suuda kustutada faili '%-.64s', veakood: %d)",

sql/share/french/errmsg.txt

@@ -7,7 +7,7 @@
 "OUI",
 "Ne peut créer le fichier '%-.64s' (Errcode: %d)",
 "Ne peut créer la table '%-.64s' (Errcode: %d)",
-"Ne peut créer la base '%-.64s'. Erreur %d",
+"Ne peut créer la base '%-.64s' (Erreur %d)",
 "Ne peut créer la base '%-.64s'; elle existe déjà",
 "Ne peut effacer la base '%-.64s'; elle n'existe pas",
 "Ne peut effacer la base '%-.64s' (erreur %d)",
@@ -213,7 +213,7 @@
 "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",
+"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",

sql/share/german/errmsg.txt

@@ -14,9 +14,9 @@
 "isamchk",
 "Nein",
 "Ja",
-"Kann Datei '%-.64s' nicht erzeugen. (Fehler: %d)",
+"Kann Datei '%-.64s' nicht erzeugen (Fehler: %d)",
-"Kann Tabelle '%-.64s' nicht erzeugen. (Fehler: %d)",
+"Kann Tabelle '%-.64s' nicht erzeugen (Fehler: %d)",
-"Kann Datenbank '%-.64s' nicht erzeugen. (Fehler: %d)",
+"Kann Datenbank '%-.64s' nicht erzeugen (Fehler: %d)",
 "Kann Datenbank '%-.64s' nicht erzeugen; datenbank '%-.64s' existiert bereits.",
 "Kann Datenbank '%-.64s' nicht löschen; keine Datenbank '%-.64s' vorhanden.",
 "Fehler beim Löschen der Datenbank. ('%-.64s' kann nicht gelöscht werden, Fehlernuumer: %d)",
@@ -222,7 +222,7 @@
 "Solange ein globaler Read LOCK gesetzt ist, ist CREATE DATABASE nicht zulässig.",
 "Falsche Argumente für %s",
 "%-.32s@%-.64s is nicht berechtigt neue Benutzer hinzuzufügen.",
-"Falsche Tabellendefinition: Sämtliche MERGE-Tabellen müssen in derselben Datenbank sein.",
+"Falsche Tabellendefinition; sämtliche MERGE-Tabellen müssen in derselben Datenbank sein.",
 "Beim Versuch einen Lock anzufordern ist ein Deadlock aufgetreten. Es wird versucht die Transaktion erneut zu starten.",
 "Der verwendete Tabellentyp unterstützt keinen FULLTEXT-Index.",
 "Foreign_Key Beschränkung konnte nicht hinzugefügt werden.",

sql/share/greek/errmsg.txt

@@ -7,8 +7,8 @@
 "ΝΑΙ",
 "Αδύνατη η δημιουργία του αρχείου '%-.64s' (κωδικός λάθους: %d)",
 "Αδύνατη η δημιουργία του πίνακα '%-.64s' (κωδικός λάθους: %d)",
-"Αδύνατη η δημιουργία της βάσης δεδομένων '%-.64s'. (κωδικός λάθους: %d)",
+"Αδύνατη η δημιουργία της βάσης δεδομένων '%-.64s' (κωδικός λάθους: %d)",
-"Αδύνατη η δημιουργία της βάσης δεδομένων '%-.64s'. Η βάση δεδομένων υπάρχει ήδη",
+"Αδύνατη η δημιουργία της βάσης δεδομένων '%-.64s'; Η βάση δεδομένων υπάρχει ήδη",
 "Αδύνατη η διαγραφή της βάσης δεδομένων '%-.64s'. Η βάση δεδομένων δεν υπάρχει",
 "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της βάσης δεδομένων (αδύνατη η διαγραφή '%-.64s', κωδικός λάθους: %d)",
 "Παρουσιάστηκε πρόβλημα κατά τη διαγραφή της βάσης δεδομένων (αδύνατη η διαγραφή του φακέλλου '%-.64s', κωδικός λάθους: %d)",
@@ -213,7 +213,7 @@
 "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",
+"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",

sql/share/hungarian/errmsg.txt

@@ -215,7 +215,7 @@
 "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",
+"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",

sql/share/italian/errmsg.txt

@@ -7,7 +7,7 @@
 "SI",
 "Impossibile creare il file '%-.64s' (errno: %d)",
 "Impossibile creare la tabella '%-.64s' (errno: %d)",
-"Impossibile creare il database '%-.64s'. (errno: %d)",
+"Impossibile creare il database '%-.64s' (errno: %d)",
 "Impossibile creare il database '%-.64s'; il database esiste",
 "Impossibile cancellare '%-.64s'; il database non esiste",
 "Errore durante la cancellazione del database (impossibile cancellare '%-.64s', errno: %d)",

sql/share/japanese/errmsg.txt

@@ -215,7 +215,7 @@
 "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",
+"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",

sql/share/korean/errmsg.txt

@@ -213,7 +213,7 @@
 "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",
+"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",

sql/share/norwegian-ny/errmsg.txt

@@ -9,7 +9,7 @@
 "JA",
 "Kan ikkje opprette fila '%-.64s' (Feilkode: %d)",
 "Kan ikkje opprette tabellen '%-.64s' (Feilkode: %d)",
-"Kan ikkje opprette databasen '%-.64s'. Feil %d",
+"Kan ikkje opprette databasen '%-.64s' (Feilkode: %d)",
 "Kan ikkje opprette databasen '%-.64s'; databasen eksisterer",
 "Kan ikkje fjerne (drop) '%-.64s'; databasen eksisterer ikkje",
 "Feil ved fjerning (drop) av databasen (kan ikkje slette '%-.64s', feil %d)",
@@ -215,7 +215,7 @@
 "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",
+"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",

sql/share/norwegian/errmsg.txt

@@ -9,7 +9,7 @@
 "JA",
 "Kan ikke opprette fila '%-.64s' (Feilkode: %d)",
 "Kan ikke opprette tabellen '%-.64s' (Feilkode: %d)",
-"Kan ikke opprette databasen '%-.64s'. Feil %d",
+"Kan ikke opprette databasen '%-.64s' (Feilkode: %d)",
 "Kan ikke opprette databasen '%-.64s'; databasen eksisterer",
 "Kan ikke fjerne (drop) '%-.64s'; databasen eksisterer ikke",
 "Feil ved fjerning (drop) av databasen (kan ikke slette '%-.64s', feil %d)",
@@ -215,7 +215,7 @@
 "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",
+"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",

sql/share/polish/errmsg.txt

@@ -11,7 +11,7 @@
 "TAK",
 "Nie mo¿na stworzyæ pliku '%-.64s' (Kod b³êdu: %d)",
 "Nie mo¿na stworzyæ tabeli '%-.64s' (Kod b³êdu: %d)",
-"Nie mo¿na stworzyæ bazy danych '%-.64s'. B³?d %d",
+"Nie mo¿na stworzyæ bazy danych '%-.64s' (Kod b³êdu: %d)",
 "Nie mo¿na stworzyæ bazy danych '%-.64s'; baza danych ju¿ istnieje",
 "Nie mo¿na usun?æ bazy danych '%-.64s'; baza danych nie istnieje",
 "B³?d podczas usuwania bazy danych (nie mo¿na usun?æ '%-.64s', b³?d %d)",
@@ -217,7 +217,7 @@
 "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",
+"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",

sql/share/romanian/errmsg.txt

@@ -11,7 +11,7 @@
 "DA",
 "Nu pot sa creez fisierul '%-.64s' (Eroare: %d)",
 "Nu pot sa creez tabla '%-.64s' (Eroare: %d)",
-"Nu pot sa creez baza de date '%-.64s'. (Eroare: %d)",
+"Nu pot sa creez baza de date '%-.64s' (Eroare: %d)",
 "Nu pot sa creez baza de date '%-.64s'; baza de date exista deja",
 "Nu pot sa drop baza de date '%-.64s'; baza da date este inexistenta",
 "Eroare dropuind baza de date (nu pot sa sterg '%-.64s', Eroare: %d)",
@@ -217,7 +217,7 @@
 "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",
+"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",

sql/share/russian/errmsg.txt

@@ -9,7 +9,7 @@
 "ДА",
 "Невозможно создать файл '%-.64s' (ошибка: %d)",
 "Невозможно создать таблицу '%-.64s' (ошибка: %d)",
-"Невозможно создать базу данных '%-.64s'. (ошибка: %d)",
+"Невозможно создать базу данных '%-.64s' (ошибка: %d)",
 "Невозможно создать базу данных '%-.64s'. База данных уже существует",
 "Невозможно удалить базу данных '%-.64s'. Такой базы данных нет",
 "Ошибка при удалении базы данных (невозможно удалить '%-.64s', ошибка: %d)",

sql/share/serbian/errmsg.txt

@@ -13,7 +13,7 @@
 "DA",
 "Ne mogu da kreiram file '%-.64s' (errno: %d)",
 "Ne mogu da kreiram tabelu '%-.64s' (errno: %d)",
-"Ne mogu da kreiram bazu '%-.64s'. (errno: %d)",
+"Ne mogu da kreiram bazu '%-.64s' (errno: %d)",
 "Ne mogu da kreiram bazu '%-.64s'; baza veæ postoji.",
 "Ne mogu da izbrišem bazu '%-.64s'; baza ne postoji.",
 "Ne mogu da izbrišem bazu (ne mogu da izbrišem '%-.64s', errno: %d)",
@@ -219,7 +219,7 @@
 "Komanda 'CREATE DATABASE' nije dozvoljena dok thread globalno zakljuèava èitanje podataka",
 "Pogrešni argumenti prosleðeni na %s",
 "Korisniku %-.32s@%-.64s nije dozvoljeno da kreira nove korisnike",
-"Pogrešna definicija tabele; Sve 'MERGE' tabele moraju biti u istoj bazi podataka",
+"Pogrešna definicija tabele; sve 'MERGE' tabele moraju biti u istoj bazi podataka",
 "Unakrsno zakljuèavanje pronaðeno kada sam pokušao da dobijem pravo na zakljuèavanje; Probajte da restartujete transakciju",
 "Upotrebljeni tip tabele ne podržava 'FULLTEXT' indekse",
 "Ne mogu da dodam proveru spoljnog kljuèa",

sql/share/slovak/errmsg.txt

@@ -15,7 +15,7 @@
 "Áno",
 "Nemô¾em vytvori» súbor '%-.64s' (chybový kód: %d)",
 "Nemô¾em vytvori» tabuµku '%-.64s' (chybový kód: %d)",
-"Nemô¾em vytvori» databázu '%-.64s'. (chybový kód: %d)",
+"Nemô¾em vytvori» databázu '%-.64s' (chybový kód: %d)",
 "Nemô¾em vytvori» databázu '%-.64s'; databáza existuje",
 "Nemô¾em zmaza» databázu '%-.64s'; databáza neexistuje",
 "Chyba pri mazaní databázy (nemô¾em zmaza» '%-.64s', chybový kód: %d)",
@@ -221,7 +221,7 @@
 "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",
+"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",

sql/share/spanish/errmsg.txt

@@ -8,7 +8,7 @@
 "SI",
 "No puedo crear archivo '%-.64s' (Error: %d)",
 "No puedo crear tabla '%-.64s' (Error: %d)",
-"No puedo crear base de datos '%-.64s'. Error %d",
+"No puedo crear base de datos '%-.64s' (Error: %d)",
 "No puedo crear base de datos '%-.64s'; la base de datos ya existe",
 "No puedo eliminar base de datos '%-.64s'; la base de datos no existe",
 "Error eliminando la base de datos(no puedo borrar '%-.64s', error %d)",
@@ -214,7 +214,7 @@
 "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",
+"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",

sql/share/swedish/errmsg.txt

@@ -7,7 +7,7 @@
 "YES",
 "Kan inte skapa filen '%-.64s' (Felkod: %d)",
 "Kan inte skapa tabellen '%-.64s' (Felkod: %d)",
-"Kan inte skapa databasen '%-.64s'. (Felkod: %d)",
+"Kan inte skapa databasen '%-.64s' (Felkod: %d)",
 "Databasen '%-.64s' existerar redan",
 "Kan inte radera databasen '%-.64s'; databasen finns inte",
 "Fel vid radering av databasen (Kan inte radera '%-.64s'. Felkod: %d)",
@@ -213,7 +213,7 @@
 "CREATE DATABASE är inte tillåtet när man har ett globalt läslås",
 "Felaktiga argument till %s",
 "%-.32s@%-.64s har inte rättighet att skapa nya användare",
-"Felaktig tabelldefinition. Alla tabeller i en MERGE-tabell måste vara i samma databas",
+"Felaktig tabelldefinition; alla tabeller i en MERGE-tabell måste vara i samma databas",
 "Fick 'DEADLOCK' vid låsförsök av block/rad. Försök att starta om transaktionen",
 "Tabelltypen har inte hantering av FULLTEXT-index",
 "Kan inte lägga till 'FOREIGN KEY constraint'",

sql/share/ukrainian/errmsg.txt

@@ -12,7 +12,7 @@
 "ТАК",
 "Не можу створити файл '%-.64s' (помилка: %d)",
 "Не можу створити таблицю '%-.64s' (помилка: %d)",
-"îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ÂÁÚÕ ÄÁÎÎÉÈ '%-.64s'. (ÐÏÍÉÌËÁ: %d)",
+"îÅ ÍÏÖÕ ÓÔ×ÏÒÉÔÉ ÂÁÚÕ ÄÁÎÎÉÈ '%-.64s' (ÐÏÍÉÌËÁ: %d)",
 "Не можу створити базу данних '%-.64s'. База данних ╕сну╓",
 "Не можу видалити базу данних '%-.64s'. База данних не ╕сну╓",
 "Не можу видалити базу данних (Не можу видалити '%-.64s', помилка: %d)",
@@ -218,7 +218,7 @@
 "CREATE DATABASE не дозволено доки г╕лка перебува╓ п╕д загальним блокуванням читання",
 "Хибний аргумент для %s",
 "Користувачу %-.32s@%-.64s не дозволено створювати нових користувач╕в",
-"Incorrect table definition; All MERGE tables must be in the same database",
+"Incorrect table definition; all MERGE tables must be in the same database",
 "Deadlock found when trying to get lock; Try restarting transaction",
 "Використаний тип таблиц╕ не п╕дтриму╓ FULLTEXT ╕ндекс╕в",
 "Cannot add foreign key constraint",

sql/sql_insert.cc

@@ -404,13 +404,12 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list,
   {
     char buff[160];
     if (duplic == DUP_IGNORE)
-      sprintf(buff,ER(ER_INSERT_INFO),info.records,
+      sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
-	      (lock_type == TL_WRITE_DELAYED) ? 0 :
+	      (lock_type == TL_WRITE_DELAYED) ? (ulong) 0 :
-	      info.records-info.copied,
+	      (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
-	      thd->cuted_fields);
     else
-      sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted,
+      sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
-	      thd->cuted_fields);
+	      (ulong) info.deleted, (ulong) thd->cuted_fields);
     ::send_ok(thd,info.copied+info.deleted,(ulonglong)id,buff);
   }
   free_underlaid_joins(thd, &thd->lex.select_lex);
@@ -1494,11 +1493,11 @@ bool select_insert::send_eof()
   {
     char buff[160];
     if (info.handle_duplicates == DUP_IGNORE)
-      sprintf(buff,ER(ER_INSERT_INFO),info.records,info.records-info.copied,
+      sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
-	      thd->cuted_fields);
+	      (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
     else
-      sprintf(buff,ER(ER_INSERT_INFO),info.records,info.deleted,
+      sprintf(buff, ER(ER_INSERT_INFO), (ulong) info.records,
-	      thd->cuted_fields);
+	      (ulong) info.deleted, (ulong) thd->cuted_fields);
     ::send_ok(thd,info.copied+info.deleted,last_insert_id,buff);
     return 0;
   }

sql/sql_load.cc

@@ -318,8 +318,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
     error= -1;				// Error on read
     goto err;
   }
-  sprintf(name,ER(ER_LOAD_INFO),info.records,info.deleted,
+  sprintf(name, ER(ER_LOAD_INFO), (ulong) info.records, (ulong) info.deleted,
-	  info.records-info.copied,thd->cuted_fields);
+	  (ulong) (info.records - info.copied), (ulong) thd->cuted_fields);
   send_ok(thd,info.copied+info.deleted,0L,name);
   // on the slave thd->query is never initialized
   if (!thd->slave_thread)

sql/sql_table.cc

@@ -2416,8 +2416,8 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
   query_cache_invalidate3(thd, table_list, 0);
 
 end_temporary:
-  sprintf(tmp_name,ER(ER_INSERT_INFO),(ulong) (copied+deleted),
+  sprintf(tmp_name, ER(ER_INSERT_INFO), (ulong) (copied + deleted),
-	  (ulong) deleted, thd->cuted_fields);
+	  (ulong) deleted, (ulong) thd->cuted_fields);
   send_ok(thd,copied+deleted,0L,tmp_name);
   thd->some_tables_deleted=0;
   DBUG_RETURN(0);

sql/sql_update.cc

@@ -373,8 +373,8 @@ int mysql_update(THD *thd,
   else
   {
     char buff[80];
-    sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated,
+    sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated,
-	    (long) thd->cuted_fields);
+	    (ulong) thd->cuted_fields);
     send_ok(thd,
 	    (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
 	    thd->insert_id_used ? thd->insert_id() : 0L,buff);
@@ -993,8 +993,8 @@ bool multi_update::send_eof()
   }
 
 
-  sprintf(buff,ER(ER_UPDATE_INFO), (long) found, (long) updated,
+  sprintf(buff, ER(ER_UPDATE_INFO), (ulong) found, (ulong) updated,
-	  (long) thd->cuted_fields);
+	  (ulong) thd->cuted_fields);
   ::send_ok(thd,
 	    (thd->client_capabilities & CLIENT_FOUND_ROWS) ? found : updated,
 	    thd->insert_id_used ? thd->insert_id() : 0L,buff);