Merging 4.1 into 5.0

BitKeeper/etc/gone:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
configure.in:
  Auto merged
client/mysqltest.c:
  Auto merged
mysql-test/r/connect.result:
  Auto merged
mysql-test/r/insert.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/insert.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/english/errmsg.txt:
  Auto merged

1 files changed, 11 insertions, 1 deletions

diff --git a/sql/share/swedish/errmsg.txt b/sql/share/swedish/errmsg.txt
index 5473f4e8e42..512314cf856 100644
--- a/sql/share/swedish/errmsg.txt
+++ b/sql/share/swedish/errmsg.txt
@@ -250,4 +250,14 @@
 "Every derived table must have it's own alias"
 "Select %u was reduced during optimisation",
 "Table '%-.64s' from one of SELECT's can not be used  in %-.32s"
-"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
\ No newline at end of file
+"Client does not support authentication protocol requested by server. Consider upgrading MySQL client"
+"Can't create a PROCEDURE from within a PROCEDURE"
+"PROCEDURE already exists"
+"PROCEDURE does not exist"
+"Failed to DROP PROCEDURE"
+"Failed to CREATE PROCEDURE"
+"%s with no matching label"
+"Redefining label"
+"End-label without match"
+"Referring to uninitialized variable"
+"SELECT in a stored procedure must have INTO"