into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/information_schema.result:
  Resolve conflicts

into  mysql.com:/home/cps/mysql/trees/mysql-5.0

Recommited with post-review fixes


server-tools/instance-manager/instance.cc:
  fix behaviour of monitoring routines: they should not  rely on the fact that instance object
  which was used when the instances started exists at stop(). Instead routines should save the
  name of the instance and look for it in the instance_map when needed.
server-tools/instance-manager/instance.h:
  new functions declared. functions, which were converted to static removed from the class.
server-tools/instance-manager/instance_options.cc:
  fix valgrind warning

into  mysql.com:/home/timka/mysql/src/5.0-2486

NOT FOUND ...' in conditional handled incorrectly".

Whenever we remove an instruction during optimization, we need to
adjust instruction numbers (ip - instruction pointer) stored in all
instructions. In addition to that, sp_instr_hpush_jump, which 
corresponds to DECLARE CONTINUE HANDLER needs adjustment for m_handler,
which holds the number of instruction with the continue handler.
In the bug report, a wrong ip stored in m_handler was pointing at 
FETCH, which resulted in an error message and abnormal SP termination.
The fix is to just remove m_handler member from sp_instr_hpush_jump,
as it's always points to the instruction next to the DECLARE
statement itself (m_ip+1).


mysql-test/r/sp.result:
  Test results fixed (Bug#12168)
mysql-test/t/sp.test:
  A test case for Bug#12168 "'DECLARE CONTINUE HANDLER FOR NOT
  FOUND ...' in conditional handled incorrectly"
sql/sp_head.cc:
  Remove m_handler (the number of continue handler instruction)
  as it always equal to m_ip+1
sql/sp_head.h:
  Remove m_handler (the number of continue handler instruction)
  as it always equal to m_ip+1

into  mysql.com:/home/timka/mysql/src/5.0-2486

- Corrected problem with N-way nested natural joins in PS mode.
- Code cleanup
- More asserts to check consistency of name resolution contexts
- Fixed potential memory leak of name resolution contexts


mysql-test/r/join.result:
  - Corrected problem with N-way nested natural joins in PS mode.
mysql-test/t/join.test:
  - Corrected problem with N-way nested natural joins in PS mode.
sql/item.h:
  - Fixed potential memory leak.
sql/sql_base.cc:
  - the local context of Item_fields that participate in TABLE_LIST::on_cond for
    natural joins is correctly set to the tables where the corresponding fields
    originate from.
  - removed unused variables
  - correct allocation of contexts
sql/sql_parse.cc:
  - correct allocation of contexts for JOIN ON conditions.
sql/table.cc:
  - added asserts to check the consistency of name resolution contexts
sql/table.h:
  - added asserts to check the consistency of name resolution contexts

  Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL


innobase/btr/btr0sea.c:
  Add diagnostic code to track a crash in adaptive hash indexes; the crash may happen if block->index == NULL

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0

  Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)


innobase/row/row0sel.c:
  Temporarily remove error print if MySQL tries to do a SELECT even though trx->n_mysql_tables_in_use is 0. We must return the error print when the lock count of cursors is properly implemented (Bug #12456)

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0

into lmy004.:/work/mysql-5.0-clean

mysql-test/r/innodb.result:
  fix result for fix of 12591
mysql-test/t/innodb.test:
  fix test for fix of 12591

into  sanja.is.com.ua:/home/bell/mysql/bk/work-bug2-5.0


sql/item_cmpfunc.cc:
  Auto merged

into  hundin.mysql.fi:/home/jan/mysql-5.0

into lmy004.:/work/mysql-5.0-bug12591


sql/sql_show.cc:
  Auto merged

into moonbone.local:/work/10624-bug-5.0-mysql


sql/sql_lex.cc:
  Auto merged

into  mysql.com:/home/jimw/my/mysql-5.0-clean


sql/item_strfunc.cc:
  Auto merged

into rurik.mysql.com:/home/igor/mysql-5.0

into mysql.com:/home/psergey/mysql-5.0-aug18-fix

Undo the test cset that shouldn't have been pushed (ChangeSet@1.1988, 2005-08-16 00:03:50+04:00, aivanov@mysql.com
 )

into rurik.mysql.com:/home/igor/mysql-5.0

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0

into mysql.com:/usersnfs/pchardin/mysql-5.0

    and Bug#12297 SP crashes the server if data inserted inside a lon loop
Third commit attempt. With fixes to the issues, showed up after full rebuild and
tests on other hosts.


mysql-test/r/rpl_sp.result:
  New warnings appeared in result file, as now we always create spcont in a stored routine.
  This is correct behaviour. We swallowed some warnings, as we used thd->spcont to check whether
  we are in the SP though we didn't set spcont in certain cases. This is fixed now.
mysql-test/r/sp.result:
  fixed result file to reflect new tests
mysql-test/t/sp.test:
  Added tests for bugs. Though one of them is disabled, as it fails because of the other bug.
  It should be enabled, when bug 12297 is fixed.
sql/sp_head.cc:
  Per-instruction arena is implemented
sql/sp_rcontext.cc:
   Now we should deal with callers_arena->free_list when we employ reuse mechanism with callers_arena
   switched during sp_eval_func_item
sql/sp_rcontext.h:
  Add new member to sp_rcontext class, in order to handle instructions with assignment
  and/or with nested SP processing properly.

mysql-test/r/row.result:
  Correct NULL handling in row comporison
mysql-test/t/row.test:
  Correct NULL handling in row comporison (BUG#12509)
sql/item_cmpfunc.cc:
  stop on NULL comparison only if it is allowed
sql/item_cmpfunc.h:
  support optimisation in case of processing WHERE/HAVING, where NULL and FALSE are equal

into  mysql.com:/home/timka/mysql/src/5.0-2486


sql/table.cc:
  Auto merged

Fixed debug printout.


sql/table.cc:
  Correct debug printout.

- Fixed minor error after Monty's review.


sql/table.cc:
  cur_table_ref is used in the first pass of the loop *before* it is set later in the loop.

into  mysql.com:/home/stewart/Documents/MySQL/5.0/main

config/ac-macros/ha_ndbcluster.m4:
  Merge fix for BUG#11538 fix.

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/sql_view.cc:
  Auto merged

  Added a test case for bug #10970.
view.result:
  Added a test case for bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).


sql/share/errmsg.txt:
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE
  (when fixing bug #10970).
sql/sql_view.cc:
  Fixed bug #10970.
  In the function mysql_create_view if a view does not refer
  any tables directly the variable table must be updated
  after the call of open_and_lock_tables.
mysql-test/r/view.result:
  Fixed bug #10970.
  Modified the error messages for error ER_VIEW_SELECT_TMPTABLE.
mysql-test/t/view.test:
  Added a test case for bug #10970.

This is quick fix and needs to be fixed when semi-consistent 
high-granularity read view is implemented (Bug #12456).

sql/item_func.cc:
  Remove unnecessary initialization, fix parens placement