summaryrefslogtreecommitdiff
path: root/sql/share
diff options
context:
space:
mode:
authorunknown <paul@kite-hub.kitebird.com>2005-01-12 20:38:05 -0600
committerunknown <paul@kite-hub.kitebird.com>2005-01-12 20:38:05 -0600
commitc73762dbdfa67c82c7887a0b3be9d1a0f5602bdf (patch)
treef4c6781a8dadd144caddf3f6131585a359cc2f23 /sql/share
parent901321b893f22a4bb07668bc121a785df62db965 (diff)
downloadmariadb-git-c73762dbdfa67c82c7887a0b3be9d1a0f5602bdf.tar.gz
user_limits.result:
Fix test result affected by error message rewording. errmsg.txt: Reword error messages. set_var.cc: Reorder variables. mysqld.cc: Reorder options. sql/mysqld.cc: Reorder options. sql/set_var.cc: Reorder variables. sql/share/errmsg.txt: Reword error messages. mysql-test/r/user_limits.result: Fix test result affected by error message rewording.
Diffstat (limited to 'sql/share')
-rw-r--r--sql/share/errmsg.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/share/errmsg.txt b/sql/share/errmsg.txt
index 5b48f27d2e3..b8ef5c413d8 100644
--- a/sql/share/errmsg.txt
+++ b/sql/share/errmsg.txt
@@ -4266,7 +4266,7 @@ ER_SLAVE_THREAD
ER_TOO_MANY_USER_CONNECTIONS 42000
dan "Brugeren %-.64s har allerede mere end 'max_user_connections' aktive forbindelser"
nla "Gebruiker %-.64s heeft reeds meer dan 'max_user_connections' actieve verbindingen"
- eng "User %-.64s has already more than 'max_user_connections' active connections"
+ eng "User %-.64s already has more than 'max_user_connections' active connections"
est "Kasutajal %-.64s on juba rohkem ühendusi kui lubatud 'max_user_connections' muutujaga"
fre "L'utilisateur %-.64s possède déjà plus de 'max_user_connections' connections actives"
ger "Benutzer '%-.64s' hat mehr als max_user_connections aktive Verbindungen"
@@ -4764,7 +4764,7 @@ ER_SLAVE_WAS_RUNNING
spa "Slave ya está funcionando"
swe "Slaven har redan startat"
ER_SLAVE_WAS_NOT_RUNNING
- eng "Slave has already been stopped"
+ eng "Slave already has been stopped"
ger "Slave wurde bereits angehalten"
por "O slave já está parado"
spa "Slave ya fué parado"