Added max_user_connections

Fixes for Innobase
Don't reset whole to-buffer in strxnmov


BUILD/compile-pentium-debug:
  Added innobase
include/mysqld_error.h:
  New error messages
innobase/configure.in:
  Update from heikki
innobase/include/lock0types.h:
  Update from heikki
innobase/include/os0sync.h:
  Update from heikki
innobase/include/sync0types.h:
  Update from heikki
innobase/os/os0file.c:
  Update from heikki
innobase/srv/srv0start.c:
  Update from heikki
sql/ha_innobase.cc:
  Update from Heikki
  Changed assert -> dbug_assert
  Changed return -> DBUG_RETURN
sql/mysql_priv.h:
  Added max_user_connections
sql/mysqld.cc:
  Added max_user_connections
sql/share/czech/errmsg.txt:
  Added max_user_connections
sql/share/danish/errmsg.txt:
  Added max_user_connections
sql/share/dutch/errmsg.txt:
  Added max_user_connections
sql/share/english/errmsg.txt:
  Added max_user_connections
sql/share/estonian/errmsg.txt:
  Added max_user_connections
sql/share/french/errmsg.txt:
  Added max_user_connections
sql/share/german/errmsg.txt:
  Added max_user_connections
sql/share/greek/errmsg.txt:
  Added max_user_connections
sql/share/hungarian/errmsg.txt:
  Added max_user_connections
sql/share/italian/errmsg.txt:
  Added max_user_connections
sql/share/japanese/errmsg.txt:
  Added max_user_connections
sql/share/korean/errmsg.txt:
  Added max_user_connections
sql/share/norwegian-ny/errmsg.txt:
  Added max_user_connections
sql/share/norwegian/errmsg.txt:
  Added max_user_connections
sql/share/polish/errmsg.txt:
  Added max_user_connections
sql/share/portuguese/errmsg.txt:
  Added max_user_connections
sql/share/romanian/errmsg.txt:
  Added max_user_connections
sql/share/russian/errmsg.txt:
  Added max_user_connections
sql/share/slovak/errmsg.txt:
  Added max_user_connections
sql/share/spanish/errmsg.txt:
  Added max_user_connections
sql/share/swedish/errmsg.OLD:
  Added max_user_connections
sql/share/swedish/errmsg.txt:
  Added max_user_connections
sql/sql_class.h:
  cleanup
strings/str_test.c:
  Added tests for strxnmov
strings/strxnmov.c:
  Don't reset whole to buffer

22 files changed, 32 insertions, 5 deletions

diff --git a/sql/share/czech/errmsg.txt b/sql/share/czech/errmsg.txt
index 319d8a88149..0ba76ca4ff2 100644
--- a/sql/share/czech/errmsg.txt
+++ b/sql/share/czech/errmsg.txt
@@ -213,3 +213,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/danish/errmsg.txt b/sql/share/danish/errmsg.txt
index 43aad2f71e4..eb2a5dc3dd2 100644
--- a/sql/share/danish/errmsg.txt
+++ b/sql/share/danish/errmsg.txt
@@ -207,3 +207,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/dutch/errmsg.txt b/sql/share/dutch/errmsg.txt
index 74bc2fe992d..3ef00cf0837 100644
--- a/sql/share/dutch/errmsg.txt
+++ b/sql/share/dutch/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/english/errmsg.txt b/sql/share/english/errmsg.txt
index 941e7f434ea..5148b25e4cf 100644
--- a/sql/share/english/errmsg.txt
+++ b/sql/share/english/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/estonian/errmsg.txt b/sql/share/estonian/errmsg.txt
index 227b6336562..f42b5209ea6 100644
--- a/sql/share/estonian/errmsg.txt
+++ b/sql/share/estonian/errmsg.txt
@@ -208,3 +208,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/french/errmsg.txt b/sql/share/french/errmsg.txt
index 594da49c32e..949a12a52b3 100644
--- a/sql/share/french/errmsg.txt
+++ b/sql/share/french/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/german/errmsg.txt b/sql/share/german/errmsg.txt
index 621cef7affa..89401557f6c 100644
--- a/sql/share/german/errmsg.txt
+++ b/sql/share/german/errmsg.txt
@@ -207,3 +207,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/greek/errmsg.txt b/sql/share/greek/errmsg.txt
index dfaea718fb1..f9018013875 100644
--- a/sql/share/greek/errmsg.txt
+++ b/sql/share/greek/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/hungarian/errmsg.txt b/sql/share/hungarian/errmsg.txt
index a6388ed624e..c81466104a7 100644
--- a/sql/share/hungarian/errmsg.txt
+++ b/sql/share/hungarian/errmsg.txt
@@ -206,3 +206,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/italian/errmsg.txt b/sql/share/italian/errmsg.txt
index f182608798e..25dd252797e 100644
--- a/sql/share/italian/errmsg.txt
+++ b/sql/share/italian/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/japanese/errmsg.txt b/sql/share/japanese/errmsg.txt
index 04b411239ae..008303c3cf5 100644
--- a/sql/share/japanese/errmsg.txt
+++ b/sql/share/japanese/errmsg.txt
@@ -206,3 +206,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/korean/errmsg.txt b/sql/share/korean/errmsg.txt
index e1efb0c15ae..231d00b44b2 100644
--- a/sql/share/korean/errmsg.txt
+++ b/sql/share/korean/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/norwegian-ny/errmsg.txt b/sql/share/norwegian-ny/errmsg.txt
index 5484b58425e..50a3345351d 100644
--- a/sql/share/norwegian-ny/errmsg.txt
+++ b/sql/share/norwegian-ny/errmsg.txt
@@ -206,3 +206,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/norwegian/errmsg.txt b/sql/share/norwegian/errmsg.txt
index 4db4af5457f..b31429fca0d 100644
--- a/sql/share/norwegian/errmsg.txt
+++ b/sql/share/norwegian/errmsg.txt
@@ -206,3 +206,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/polish/errmsg.txt b/sql/share/polish/errmsg.txt
index 5e90cf05b8e..d8126917c1b 100644
--- a/sql/share/polish/errmsg.txt
+++ b/sql/share/polish/errmsg.txt
@@ -208,3 +208,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/portuguese/errmsg.txt b/sql/share/portuguese/errmsg.txt
index 33618a0e671..c1f4595f1b2 100644
--- a/sql/share/portuguese/errmsg.txt
+++ b/sql/share/portuguese/errmsg.txt
@@ -204,3 +204,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/romanian/errmsg.txt b/sql/share/romanian/errmsg.txt
index 115bcc299f2..235493e538d 100644
--- a/sql/share/romanian/errmsg.txt
+++ b/sql/share/romanian/errmsg.txt
@@ -208,3 +208,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/russian/errmsg.txt b/sql/share/russian/errmsg.txt
index d3564e5ef5b..c08c471e9e1 100644
--- a/sql/share/russian/errmsg.txt
+++ b/sql/share/russian/errmsg.txt
@@ -207,3 +207,4 @@
 "üÔÏÔ ÓÅÒ×ÅÒ ÎÅ slave, ÉÓÐÒÁ×ØÔÅ × ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÍ ÆÁÊÌÅ ÉÌÉ ËÏÍÍÁÎÄÏÊ CHANGE MASTER TO",
 "îÅ ÐÏÌÕÞÉÌÏÓØ ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÓÔÒÕËÔÕÒÕ master info, ÐÒÏ×ÅÒÔÅ persmissions ÎÁ ÆÁÊÌÅ master.info",
 "îÅ ÍÏÇÕ ÓÏÚÄÁÔØ ÐÒÏÃÅÓÓ SLAVE, ÐÒÏ×ÅÒØÔÅ ÓÉÓÔÅÍÎÙÅ ÒÅÓÕÒÓÙ",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/slovak/errmsg.txt b/sql/share/slovak/errmsg.txt
index 82817fff7d6..c80e30bb775 100644
--- a/sql/share/slovak/errmsg.txt
+++ b/sql/share/slovak/errmsg.txt
@@ -212,3 +212,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/spanish/errmsg.txt b/sql/share/spanish/errmsg.txt
index 50c5f4ea8c1..641ac3e1dce 100644
--- a/sql/share/spanish/errmsg.txt
+++ b/sql/share/spanish/errmsg.txt
@@ -205,3 +205,4 @@
 "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 create slave thread, check system resources",
+"User %-.64s has already more than 'max_user_connections' active connections",
diff --git a/sql/share/swedish/errmsg.OLD b/sql/share/swedish/errmsg.OLD
index ee3d913e51a..132a9fdf4f9 100644
--- a/sql/share/swedish/errmsg.OLD
+++ b/sql/share/swedish/errmsg.OLD
@@ -199,3 +199,9 @@
 "Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades",
 "Warning:  Några icke transaktionella tabeller kunde inte återställas vid ROLLBACK",
 "Transaktionen krävde mera än 'max_binlog_cache_size' minne. Utöka denna mysqld variabel och försök på nytt",
+"Denna operation kan inte göras under replikering; Gör SLAVE STOP först",
+"Denna operation kan endast göras under replikering; Konfigurera slaven och gör SLAVE START",
+"Servern är inte konfigurerade som en replikations slav. Ändra konfigurationsfilen eller gör CHANGE MASTER TO",
+"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna för 'master.info'",
+"Kunde inte starta en tråd för replikering",
+"Användare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",
diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index a47bdf7428e..132a9fdf4f9 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -199,8 +199,9 @@
 "Tabell '%-.64s' är crashad och senast (automatiska?) reparation misslyckades",
 "Warning:  Några icke transaktionella tabeller kunde inte återställas vid ROLLBACK",
 "Transaktionen krävde mera än 'max_binlog_cache_size' minne. Utöka denna mysqld variabel och försök på nytt",
-"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 create slave thread, check system resources",
+"Denna operation kan inte göras under replikering; Gör SLAVE STOP först",
+"Denna operation kan endast göras under replikering; Konfigurera slaven och gör SLAVE START",
+"Servern är inte konfigurerade som en replikations slav. Ändra konfigurationsfilen eller gör CHANGE MASTER TO",
+"Kunde inte initializera replications-strukturerna. Kontrollera privilegerna för 'master.info'",
+"Kunde inte starta en tråd för replikering",
+"Användare '%-.64s' har redan 'max_user_connections' aktiva inloggningar",