mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-30 10:31:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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


mysql-test/r/rpl_rotate_logs.result:
  Auto merged
This commit is contained in:
unknown 2003-12-16 21:53:18 +01:00
commit a8e8a24990
14 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mysql-test/r/rpl_rotate_logs.result
View file

@ -1,11 +1,11 @@
drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4;
drop table if exists t1, t2, t3, t4; drop table if exists t1, t2, t3, t4;
slave start; 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; 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'; 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; reset slave;
change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root'; change master to master_host='127.0.0.1',master_port=MASTER_PORT, master_user='root';
reset master; reset master;

2
sql/share/czech/errmsg.txt
View file

@ -211,7 +211,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/english/errmsg.txt
View file

@ -202,7 +202,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/estonian/errmsg.txt
View file

@ -207,7 +207,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"Kasutajal %-.64s on juba rohkem ühendusi kui lubatud 'max_user_connections' muutujaga", "Kasutajal %-.64s on juba rohkem ühendusi kui lubatud 'max_user_connections' muutujaga",
"Ainult konstantsed suurused on lubatud SET klauslis", "Ainult konstantsed suurused on lubatud SET klauslis",

2
sql/share/french/errmsg.txt
View file

@ -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 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", "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", "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", "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", "L'utilisateur %-.64s possède déjà plus de 'max_user_connections' connections actives",
"Seules les expressions constantes sont autorisées avec SET", "Seules les expressions constantes sont autorisées avec SET",

2
sql/share/greek/errmsg.txt
View file

@ -202,7 +202,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/hungarian/errmsg.txt
View file

@ -204,7 +204,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/japanese/errmsg.txt
View file

@ -204,7 +204,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/korean/errmsg.txt
View file

@ -202,7 +202,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/norwegian-ny/errmsg.txt
View file

@ -204,7 +204,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/norwegian/errmsg.txt
View file

@ -204,7 +204,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/polish/errmsg.txt
View file

@ -206,7 +206,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/romanian/errmsg.txt
View file

@ -206,7 +206,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",

2
sql/share/slovak/errmsg.txt
View file

@ -210,7 +210,7 @@
"This operation cannot be performed with a running slave, run SLAVE STOP first", "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", "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", "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", "Could not create slave thread, check system resources",
"User %-.64s has already more than 'max_user_connections' active connections", "User %-.64s has already more than 'max_user_connections' active connections",
"You may only use constant expressions with SET", "You may only use constant expressions with SET",