After merge fixes

Note: The following tests fails
- fulltext (Sergei has promised to fix)
- rpl_charset (Guilhem should fix)
- rpl_timezone (Dimitray has promised to fix)

Sanja needs to check out the calling of close_thread_tables() in sp_head.cc


myisam/mi_check.c:
  After merge fix
myisam/sort.c:
  After merge fix
mysql-test/mysql-test-run.sh:
  Export master socket to mysqltest
mysql-test/r/func_group.result:
  Make result repeatable
mysql-test/r/mysqlbinlog.result:
  After merge fix
mysql-test/r/ps_1general.result:
  After merge fix
mysql-test/r/ps_2myisam.result:
  After merge fix
mysql-test/r/ps_3innodb.result:
  After merge fix
mysql-test/r/ps_4heap.result:
  After merge fix
mysql-test/r/ps_5merge.result:
  After merge fix
mysql-test/r/ps_6bdb.result:
  After merge fix
mysql-test/r/rpl_flush_log_loop.result:
  After merge fix
mysql-test/r/rpl_replicate_do.result:
  After merge fix
mysql-test/r/rpl_temporary.result:
  After merge fix
mysql-test/r/rpl_timezone.result:
  After merge fix
  Note that this test fails now (Dimitry has promised to fix this)
mysql-test/r/rpl_user_variables.result:
  After merge fix
mysql-test/r/select.result:
  After merge fix
mysql-test/r/sp-error.result:
  After merge fix
mysql-test/r/sp-security.result:
  After merge fix
mysql-test/r/sp.result:
  After merge fix
mysql-test/r/user_var.result:
  After merge fix
mysql-test/r/variables.result:
  After merge fix
mysql-test/t/alter_table.test:
  After merge fix
mysql-test/t/derived.test:
  After merge fix
mysql-test/t/func_group.test:
  Make result repeatable
mysql-test/t/grant_cache.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/multi_update.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/rpl000015.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/rpl000017.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/rpl000018.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/rpl_charset.test:
  After merge fix
mysql-test/t/rpl_heap.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/rpl_rotate_logs.test:
  Use MASTER_MYSOCK instead of master.sock
mysql-test/t/sp-error.test:
  after merge fix
mysql-test/t/sp-security.test:
  after merge fix
mysql-test/t/user_var.test:
  after merge fix
scripts/mysql_fix_privilege_tables.sh:
  This can now be exectued from the source distribution
sql/handler.cc:
  Cleanup
sql/handler.h:
  More debugging
sql/item.h:
  Indentation fixes
sql/item_cmpfunc.cc:
  After merge fixes
sql/opt_range.cc:
  After merge fixes
sql/opt_range.h:
  After merge fixes
sql/sp.cc:
  After merge fixes
sql/sp_head.cc:
  Remove closing of thread tables in a SP function as this caused a core dump.
  (Has to be fixed better)
sql/sql_base.cc:
  More debugging
sql/sql_handler.cc:
  After merge fixes
  (We have to call ha_index_or_rnd_end() before calling close_thread_table())
sql/sql_parse.cc:
  More debugging
sql/sql_prepare.cc:
  After merge fixes
sql/sql_select.cc:
  After merge fixes

mysql-test/t/sp-error.test

@@ -49,18 +49,18 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1296
+--error 1301
 create procedure foo()
   create procedure bar() set @x=3|
---error 1296
+--error 1301
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1297
+--error 1302
 create procedure proc1()
   set @x = 42|
---error 1297
+--error 1302
 create function func1() returns int
   return 42|
 
@@ -68,39 +68,39 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1298
+--error 1303
 alter procedure foo|
---error 1298
+--error 1303
 alter function foo|
---error 1298
+--error 1303
 drop procedure foo|
---error 1298
+--error 1303
 drop function foo|
---error 1298
+--error 1303
 call foo()|
 drop procedure if exists foo|
---error 1298
+--error 1303
 show create procedure foo|
 
 # LEAVE/ITERATE with no match
---error 1301
+--error 1306
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1301
+--error 1306
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
---error 1301
+--error 1306
 create procedure foo()
 foo: begin
   iterate foo;
 end|
 
 # Redefining label
---error 1302
+--error 1307
 create procedure foo()
 foo: loop
   foo: loop
@@ -109,7 +109,7 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1303
+--error 1308
 create procedure foo()
 foo: loop
   set @x=2;
@@ -124,12 +124,12 @@ end|
 drop procedure foo|
 
 # RETURN in FUNCTION only
---error 1306
+--error 1311
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1307
+--error 1312
 create function foo() returns int
 begin
   declare x int;
@@ -143,19 +143,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1311
+--error 1316
 call p()|
---error 1311
+--error 1316
 call p(1, 2)|
---error 1311
+--error 1316
 select f()|
---error 1311
+--error 1316
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1312
+--error 1317
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -169,7 +169,7 @@ begin
   end if;
 end|
 
---error 1312
+--error 1317
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -184,7 +184,7 @@ begin
   end if;
 end|
 
---error 1313
+--error 1318
 create function f(val int) returns int
 begin
   declare x int;
@@ -202,12 +202,12 @@ begin
   end if;
 end|
 
---error 1314
+--error 1319
 select f(10)|
 
 drop function f|
 
---error 1315
+--error 1320
 create procedure p()
 begin
   declare c cursor for insert into test.t1 values ("foo", 42);
@@ -216,7 +216,7 @@ begin
   close c;
 end|
 
---error 1316
+--error 1321
 create procedure p()
 begin
   declare x int;
@@ -226,7 +226,7 @@ begin
   close c;
 end|
 
---error 1317
+--error 1322
 create procedure p()
 begin
   declare c cursor for select * from test.t;
@@ -248,7 +248,7 @@ begin
   open c;
   close c;
 end|
---error 1318
+--error 1323
 call p()|
 drop procedure p|
 
@@ -260,11 +260,11 @@ begin
   close c;
   close c;
 end|
---error 1319
+--error 1324
 call p()|
 drop procedure p|
 
---error 1298
+--error 1303
 alter procedure bar3 sql security invoker|
 --error 1059
 alter procedure bar3 name
@@ -278,7 +278,7 @@ drop table if exists t1|
 create table t1 (val int, x float)|
 insert into t1 values (42, 3.1), (19, 1.2)|
 
---error 1320
+--error 1325
 create procedure p()
 begin
   declare x int;
@@ -298,7 +298,7 @@ begin
   fetch c into x;
   close c;
 end|
---error 1321
+--error 1326
 call p()|
 drop procedure p|
 
@@ -313,34 +313,34 @@ begin
   fetch c into x, y, z;
   close c;
 end|
---error 1321
+--error 1326
 call p()|
 drop procedure p|
 
---error 1323
+--error 1328
 create procedure p(in x int, x char(10))
 begin
 end|
---error 1323
+--error 1328
 create function p(x int, x char(10))
 begin
 end|
 
---error 1324
+--error 1329
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
 
---error 1325	
+--error 1330	
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
 
---error 1326
+--error 1331
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -348,18 +348,18 @@ begin
 end|
 
 # USE is not allowed
---error 1329
+--error 1334
 create procedure u()
   use sptmp|
 
 # Enforced standard order of declarations
---error 1330
+--error 1335
 create procedure p()
 begin
   declare c cursor for select * from t1;
   declare x int;
 end|
---error 1330
+--error 1335
 create procedure p()
 begin
   declare x int;
@@ -367,7 +367,7 @@ begin
   declare foo condition for sqlstate '42S99';
 end|
 
---error 1331
+--error 1336
 create procedure p()
 begin
   declare x int;
@@ -392,13 +392,13 @@ drop procedure bug1965|
 #
 # BUG#1966
 #
---error 1320
+--error 1325
 select 1 into a|
 
 #
 # BUG#336
 #
---error 1328
+--error 1333
 create procedure bug336(id char(16))
 begin
   declare x int;
@@ -408,7 +408,7 @@ end|
 #
 # BUG#1654
 #
---error 1307
+--error 1312
 create function bug1654()
   returns int
 return (select sum(t.data) from test.t2 t)|
@@ -446,7 +446,7 @@ begin
   fetch c1 into v1;
 end|
 
---error 1319
+--error 1324
 call bug2259()|
 drop procedure bug2259|
 
@@ -502,7 +502,7 @@ begin
   end case;
   return 2;
 end|
---error 1332
+--error 1337
 select bug3287()|
 drop function bug3287|
 
@@ -513,7 +513,7 @@ when 0 then
 when 1 then
   insert into test.t1 values (x, 1.1);
 end case|
---error 1332
+--error 1337
 call bug3287(2)|
 drop procedure bug3287|