Merging 4.1 into 5.0 (second pass; post-merge fixes).

One test in subselect.test still wrong.
Had to reconstruct all errmsg.txt files completely, since auto-merge made
a mess of the lot. :-(


mysql-test/r/sp-error.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/r/subselect.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja. :)
mysql-test/r/variables.result:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/sp-error.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
mysql-test/t/subselect.test:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
  One test still wrong (different from 4.1), left for Sanja :)
scripts/mysql_create_system_tables.sh:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_cmpfunc.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_subselect.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/item_sum.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysql_priv.h:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/mysqld.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/danish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/dutch/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/english/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/estonian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/french/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/german/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/greek/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/hungarian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/italian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/japanese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/korean/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian-ny/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/norwegian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/polish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/portuguese/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/russian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/serbian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/slovak/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/spanish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/swedish/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/share/ukrainian/errmsg.txt:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sp.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_base.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_cache.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_insert.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_parse.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_select.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).
sql/sql_update.cc:
  Merging 4.1 into 5.0 (second pass; post-merge fixes).

1 files changed, 25 insertions, 25 deletions

diff --git a/mysql-test/r/sp-error.result b/mysql-test/r/sp-error.result
index 0c1db1703ac..11935e4b137 100644
--- a/mysql-test/r/sp-error.result
+++ b/mysql-test/r/sp-error.result
@@ -1,98 +1,98 @@
 delete from mysql.proc;
 create procedure syntaxerror(t int);
-You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 create procedure syntaxerror(t int);
-You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 create procedure syntaxerror(t int);
-You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
+ERROR 42000: You have an error in your SQL syntax.  Check the manual that corresponds to your MySQL server version for the right syntax to use near '' at line 1
 create procedure proc1()
 set @x = 42;
 create function func1() returns int
 return 42;
 create procedure foo()
 create procedure bar() set @x=3;
-Can't create a PROCEDURE from within another stored routine
+ERROR HY000: Can't create a PROCEDURE from within another stored routine
 create procedure foo()
 create function bar() returns double return 2.3;
-Can't create a FUNCTION from within another stored routine
+ERROR HY000: Can't create a FUNCTION from within another stored routine
 create procedure proc1()
 set @x = 42;
-PROCEDURE proc1 already exists
+ERROR HY000: PROCEDURE proc1 already exists
 create function func1() returns int
 return 42;
-FUNCTION func1 already exists
+ERROR HY000: FUNCTION func1 already exists
 drop procedure proc1;
 drop function func1;
 alter procedure foo;
-PROCEDURE foo does not exist
+ERROR HY000: PROCEDURE foo does not exist
 alter function foo;
-FUNCTION foo does not exist
+ERROR HY000: FUNCTION foo does not exist
 drop procedure foo;
-PROCEDURE foo does not exist
+ERROR HY000: PROCEDURE foo does not exist
 drop function foo;
-FUNCTION foo does not exist
+ERROR HY000: FUNCTION foo does not exist
 call foo();
-PROCEDURE foo does not exist
+ERROR HY000: PROCEDURE foo does not exist
 drop procedure if exists foo;
 Warnings:
-Warning	1261	PROCEDURE foo does not exist
+Warning	1272	PROCEDURE foo does not exist
 create procedure foo()
 foo: loop
 leave bar;
 end loop;
-LEAVE with no matching label: bar
+ERROR HY000: LEAVE with no matching label: bar
 create procedure foo()
 foo: loop
 iterate bar;
 end loop;
-ITERATE with no matching label: bar
+ERROR HY000: ITERATE with no matching label: bar
 create procedure foo()
 foo: loop
 foo: loop
 set @x=2;
 end loop foo;
 end loop foo;
-Redefining label foo
+ERROR HY000: Redefining label foo
 create procedure foo()
 foo: loop
 set @x=2;
 end loop bar;
-End-label bar without match
+ERROR HY000: End-label bar without match
 create procedure foo(out x int)
 begin
 declare y int;
 set x = y;
 end;
-Referring to uninitialized variable y
+ERROR HY000: Referring to uninitialized variable y
 create procedure foo()
 begin
 select name from mysql.proc;
 select type from mysql.proc;
 end;
 call foo();
-SELECT in a stored procedure must have INTO
+ERROR HY000: SELECT in a stored procedure must have INTO
 drop procedure foo;
 create procedure foo()
 return 42;
-RETURN is only allowed in a FUNCTION
+ERROR HY000: RETURN is only allowed in a FUNCTION
 create function foo() returns int
 begin
 declare x int;
 select max(c) into x from test.t;
 return x;
 end;
-Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION
+ERROR HY000: Queries, like SELECT, INSERT, UPDATE (and others), are not allowed in a FUNCTION
 create procedure p(x int)
 insert into test.t1 values (x);
 create function f(x int) returns int
 return x+42;
 call p();
-Wrong number of arguments for PROCEDURE p, expected 1, got 0
+ERROR HY000: Wrong number of arguments for PROCEDURE p, expected 1, got 0
 call p(1, 2);
-Wrong number of arguments for PROCEDURE p, expected 1, got 2
+ERROR HY000: Wrong number of arguments for PROCEDURE p, expected 1, got 2
 select f();
-Wrong number of arguments for FUNCTION f, expected 1, got 0
+ERROR HY000: Wrong number of arguments for FUNCTION f, expected 1, got 0
 select f(1, 2);
-Wrong number of arguments for FUNCTION f, expected 1, got 2
+ERROR HY000: Wrong number of arguments for FUNCTION f, expected 1, got 2
 drop procedure p;
 drop function f;