After merge fixes of merge with 4.1 that included the new arena code.

Fixed (together with Guilhem) bugs in mysqlbinlog regarding --offset
Prefix addresses with 0x for easier comparisons of debug logs
Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
This fix changed some 'index' queries to 'range' queries in the test suite
Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
This fix removed of a lot of 'Using where' notes in the test suite.
Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
Give NOTE instead of WARNING for safe field-type conversions


Makefile.am:
  Don't automaticly update files from bk
client/mysqlbinlog.cc:
  Merge with 4.1 (+ apply bug fixes for --offset and --start-position)
include/my_sys.h:
  Faster clear_alloc_root()
mysql-test/r/bdb.result:
  Updated results after merge
mysql-test/r/create.result:
  Updated results after merge
mysql-test/r/func_group.result:
  Updated results after merge
mysql-test/r/func_if.result:
  Updated results after merge
mysql-test/r/heap_btree.result:
  Updated results after merge
mysql-test/r/index_merge.result:
  Updated results after merge
mysql-test/r/index_merge_ror.result:
  Updated results after merge
mysql-test/r/innodb.result:
  Updated results after merge
mysql-test/r/join_outer.result:
  Updated results after merge
mysql-test/r/mysqlbinlog2.result:
  Updated results after merge
mysql-test/r/negation_elimination.result:
  Updated results after merge
mysql-test/r/null.result:
  Updated results after merge
  Added more tests
mysql-test/r/null_key.result:
  Updated results after merge
  Added more tests
mysql-test/r/order_by.result:
  Updated results after merge
mysql-test/r/range.result:
  Updated results after merge
  Added more tests
mysql-test/r/rpl_charset.result:
  Updated results after merge
mysql-test/r/sp-error.result:
  Updated results after merge
mysql-test/r/sp.result:
  Updated results after merge
  Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
mysql-test/r/type_blob.result:
  Updated results after merge
  (Some warnings are now notes)
mysql-test/r/user_var.result:
  Updated results after merge
  Added more tests
mysql-test/r/variables.result:
  Updated results after merge
mysql-test/r/view.result:
  Updated results after merge
mysql-test/t/mysqlbinlog2.test:
  Updated tests to use new positions
mysql-test/t/null.test:
  More tests
mysql-test/t/null_key.test:
  More tests
mysql-test/t/range.test:
  More tests
mysql-test/t/rpl_charset.test:
  Avoid big diffs in the future if tests changes
mysql-test/t/sp-error.test:
  Updated error numbers
mysql-test/t/sp-security.test:
  Updated error numbers
mysql-test/t/sp.test:
  Updated results after merge
  Added delete of some stored procedures in an attempt to be able to re-run test even if it aborts in the middle
mysql-test/t/user_var.test:
  More tests
mysql-test/t/view.test:
  Updated error numbers
mysys/my_alloc.c:
  Write into debug log the address of the allocated area
sql/ha_isam.cc:
  Prefix addresses with 0x for easier comparisons of debug logs
sql/ha_myisam.cc:
  Prefix addresses with 0x for easier comparisons of debug logs
sql/ha_ndbcluster.cc:
  Add missing enum to switch
sql/handler.cc:
  remove compiler warning
sql/item.cc:
  More debugging
  Simple cleanup
sql/item.h:
  Move Item::cleanup() to item.cc
sql/item_cmpfunc.cc:
  Fix arena code
sql/item_subselect.cc:
  After merge fixes
sql/item_subselect.h:
  After merge fixes
sql/item_sum.cc:
  Updated comment
sql/log_event.cc:
  Remove wrong test
sql/mysql_priv.h:
  Indentation fixes
sql/mysqld.cc:
  After merge fixes
  Added 0x to pointers in debug log
sql/opt_range.cc:
  Fixed problem where MySQL choosed index-read even if there would be a much better range on the same index
  This fix changed some 'index' queries to 'range' queries in the test suite
sql/set_var.cc:
  Indentation fixes
sql/sp_head.cc:
  Set state to INITIALIZED to make SP work with new arena code
sql/sql_base.cc:
  After merge fixes
sql/sql_class.cc:
  More debugging
  Use clear_alloc_root() instead of init_alloc_root() as the former is faster
sql/sql_class.h:
  New method 'only_prepare()'
sql/sql_lex.cc:
  After merge fixes
sql/sql_lex.h:
  After merge fixes
sql/sql_parse.cc:
  Fix for timezone tables. (The old way to add timezone tables to global list in 'create_total_list' doesn't work anymore)
  Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
sql/sql_prepare.cc:
  After merge fixes
sql/sql_select.cc:
  Don't create 'dummy' WHERE clause for trivial WHERE clauses where we can remove the WHERE clause.
  This fix removed of a lot of 'Using where' notes in the test suite
sql/sql_table.cc:
  Give NOTE instead of WARNING if table/function doesn't exists when using DROP IF EXISTS
sql/sql_union.cc:
  After merge fix
sql/sql_view.cc:
  After merge fix
sql/table.cc:
  After merge fix
sql/tztime.cc:
  Update timezone table handling to use new table lists structure
sql/tztime.h:
  Update timezone table handling to use new table lists structure
sql/unireg.cc:
  Use 0x before pointers

1 files changed, 56 insertions, 56 deletions

diff --git a/mysql-test/t/sp-error.test b/mysql-test/t/sp-error.test
index f8abab0e7e3..d07c866ff79 100644
--- a/mysql-test/t/sp-error.test
+++ b/mysql-test/t/sp-error.test
@@ -49,18 +49,18 @@ create function func1() returns int
   return 42|
 
 # Can't create recursively
---error 1302
+--error 1303
 create procedure foo()
   create procedure bar() set @x=3|
---error 1302
+--error 1303
 create procedure foo()
   create function bar() returns double return 2.3|
 
 # Already exists
---error 1303
+--error 1304
 create procedure proc1()
   set @x = 42|
---error 1303
+--error 1304
 create function func1() returns int
   return 42|
 
@@ -68,42 +68,42 @@ drop procedure proc1|
 drop function func1|
 
 # Does not exist
---error 1304
+--error 1305
 alter procedure foo|
---error 1304
+--error 1305
 alter function foo|
---error 1304
+--error 1305
 drop procedure foo|
---error 1304
+--error 1305
 drop function foo|
---error 1304
+--error 1305
 call foo()|
 drop procedure if exists foo|
---error 1304
+--error 1305
 show create procedure foo|
 
 # LEAVE/ITERATE/GOTO with no match
---error 1307
+--error 1308
 create procedure foo()
 foo: loop
   leave bar;
 end loop|
---error 1307
+--error 1308
 create procedure foo()
 foo: loop
   iterate bar;
 end loop|
---error 1307
+--error 1308
 create procedure foo()
 foo: begin
   iterate foo;
 end|
---error 1307
+--error 1308
 create procedure foo()
 begin
   goto foo;
 end|
---error 1307
+--error 1308
 create procedure foo()
 begin
   begin
@@ -111,7 +111,7 @@ begin
   end;
   goto foo;
 end|
---error 1307
+--error 1308
 create procedure foo()
 begin
   goto foo;
@@ -119,7 +119,7 @@ begin
     label foo;
   end;
 end|
---error 1307
+--error 1308
 create procedure foo()
 begin
   begin
@@ -129,7 +129,7 @@ begin
     label foo;
   end;
 end|
---error 1307
+--error 1308
 create procedure foo()
 begin
   begin
@@ -141,7 +141,7 @@ begin
 end|
 
 # Redefining label
---error 1308
+--error 1309
 create procedure foo()
 foo: loop
   foo: loop
@@ -150,7 +150,7 @@ foo: loop
 end loop foo|
 
 # End label mismatch
---error 1309
+--error 1310
 create procedure foo()
 foo: loop
   set @x=2;
@@ -165,12 +165,12 @@ end|
 drop procedure foo|
 
 # RETURN in FUNCTION only
---error 1312
+--error 1313
 create procedure foo()
   return 42|
 
 # Doesn't allow queries in FUNCTIONs (for now :-( )
---error 1313
+--error 1314
 create function foo() returns int
 begin
   declare x int;
@@ -184,19 +184,19 @@ create procedure p(x int)
 create function f(x int) returns int
   return x+42|
 
---error 1317
+--error 1318
 call p()|
---error 1317
+--error 1318
 call p(1, 2)|
---error 1317
+--error 1318
 select f()|
---error 1317
+--error 1318
 select f(1, 2)|
 
 drop procedure p|
 drop function f|
 
---error 1318
+--error 1319 
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -210,7 +210,7 @@ begin
   end if;
 end|
 
---error 1318
+--error 1319 
 create procedure p(val int, out res int)
 begin
   declare x int default 0;
@@ -225,7 +225,7 @@ begin
   end if;
 end|
 
---error 1319
+--error 1320
 create function f(val int) returns int
 begin
   declare x int;
@@ -243,12 +243,12 @@ begin
   end if;
 end|
 
---error 1320
+--error 1321
 select f(10)|
 
 drop function f|
 
---error 1321
+--error 1322
 create procedure p()
 begin
   declare c cursor for insert into test.t1 values ("foo", 42);
@@ -257,7 +257,7 @@ begin
   close c;
 end|
 
---error 1322
+--error 1323
 create procedure p()
 begin
   declare x int;
@@ -267,7 +267,7 @@ begin
   close c;
 end|
 
---error 1323
+--error 1324
 create procedure p()
 begin
   declare c cursor for select * from test.t;
@@ -289,7 +289,7 @@ begin
   open c;
   close c;
 end|
---error 1324
+--error 1325
 call p()|
 drop procedure p|
 
@@ -301,11 +301,11 @@ begin
   close c;
   close c;
 end|
---error 1325
+--error 1326
 call p()|
 drop procedure p|
 
---error 1304
+--error 1305
 alter procedure bar3 sql security invoker|
 --error 1059
 alter procedure bar3 name
@@ -319,7 +319,7 @@ drop table if exists t1|
 create table t1 (val int, x float)|
 insert into t1 values (42, 3.1), (19, 1.2)|
 
---error 1326
+--error 1327
 create procedure p()
 begin
   declare x int;
@@ -339,7 +339,7 @@ begin
   fetch c into x;
   close c;
 end|
---error 1327
+--error 1328
 call p()|
 drop procedure p|
 
@@ -354,34 +354,34 @@ begin
   fetch c into x, y, z;
   close c;
 end|
---error 1327
+--error 1328
 call p()|
 drop procedure p|
 
---error 1329
+--error 1330
 create procedure p(in x int, x char(10))
 begin
 end|
---error 1329
+--error 1330
 create function p(x int, x char(10))
 begin
 end|
 
---error 1330
+--error 1331
 create procedure p()
 begin
   declare x float;
   declare x int;
 end|
 
---error 1331	
+--error 1332	
 create procedure p()
 begin
   declare c condition for 1064;
   declare c condition for 1065;
 end|
 
---error 1332
+--error 1333
 create procedure p()
 begin
   declare c cursor for select * from t1;
@@ -389,18 +389,18 @@ begin
 end|
 
 # USE is not allowed
---error 1335
+--error 1336
 create procedure u()
   use sptmp|
 
 # Enforced standard order of declarations
---error 1336
+--error 1337
 create procedure p()
 begin
   declare c cursor for select * from t1;
   declare x int;
 end|
---error 1336
+--error 1337
 create procedure p()
 begin
   declare x int;
@@ -408,7 +408,7 @@ begin
   declare foo condition for sqlstate '42S99';
 end|
 
---error 1337
+--error 1338
 create procedure p()
 begin
   declare x int;
@@ -416,7 +416,7 @@ begin
   declare c cursor for select * from t1;
 end|
 
---error 1357
+--error 1358
 create procedure p()
 begin
   declare continue handler for sqlexception
@@ -445,13 +445,13 @@ drop procedure bug1965|
 #
 # BUG#1966
 #
---error 1326
+--error 1327
 select 1 into a|
 
 #
 # BUG#1654
 #
---error 1313
+--error 1314
 create function bug1654()
   returns int
 return (select sum(t.data) from test.t2 t)|
@@ -489,7 +489,7 @@ begin
   fetch c1 into v1;
 end|
 
---error 1325
+--error 1326
 call bug2259()|
 drop procedure bug2259|
 
@@ -545,7 +545,7 @@ begin
   end case;
   return 2;
 end|
---error 1338
+--error 1339
 select bug3287()|
 drop function bug3287|
 
@@ -556,7 +556,7 @@ when 0 then
 when 1 then
   insert into test.t1 values (x, 1.1);
 end case|
---error 1338
+--error 1339
 call bug3287(2)|
 drop procedure bug3287|
 
@@ -622,9 +622,9 @@ drop procedure bug2653_2|
 #
 # BUG#4344
 #
---error 1356
+--error 1357
 create procedure bug4344() drop procedure bug4344|
---error 1356
+--error 1357
 create procedure bug4344() drop function bug4344|