Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/mysql_src/mysql-4.0

mysql-test/r/rpl_rotate_logs.result

 drop table if exists t1, t2, t3, t4;
 drop table if exists t1, t2, t3, t4;
 slave start;
-Could not initialize master info structure, check permisions on master.info
+Could not initialize master info structure, more error messages can be found in the MySQL error log
 slave start;
-Could not initialize master info structure, check permisions on master.info
+Could not initialize master info structure, more error messages can be found in the MySQL error log
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
-Could not initialize master info structure, check permisions on master.info
+Could not initialize master info structure, more error messages can be found in the MySQL error log
 reset slave;
 change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
 reset master;

sql/share/czech/errmsg.txt

@@ -211,7 +211,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/english/errmsg.txt

@@ -202,7 +202,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/estonian/errmsg.txt

@@ -207,7 +207,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "Could not create slave thread, check system resources",
 "Kasutajal %-.64s on juba rohkem hendusi kui lubatud 'max_user_connections' muutujaga",
 "Ainult konstantsed suurused on lubatud SET klauslis",

sql/share/french/errmsg.txt

@@ -202,7 +202,7 @@
 "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 d'initialiser les structures d'information de maître, vous trouverez des messages d'erreur supplémentaires dans le journal des erreurs de MySQL",
 "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",

sql/share/greek/errmsg.txt

@@ -202,7 +202,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/hungarian/errmsg.txt

@@ -204,7 +204,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/japanese/errmsg.txt

@@ -204,7 +204,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/korean/errmsg.txt

@@ -202,7 +202,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/norwegian-ny/errmsg.txt

@@ -204,7 +204,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/norwegian/errmsg.txt

@@ -204,7 +204,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/polish/errmsg.txt

@@ -206,7 +206,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/romanian/errmsg.txt

@@ -206,7 +206,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",

sql/share/slovak/errmsg.txt

@@ -210,7 +210,7 @@
 "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 initialize master info structure, more error messages can be found in the MySQL error log",
 "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",