mysql-test/lib/init_db.sql:
  this should be longblob or info_schema test will fail
mysql-test/r/rpl_delete_all.result:
  fix result of a test, the error message is different (bug #12591)
mysql-test/t/rpl_delete_all.test:
  fix test, now the error code is different (bug #12591)

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  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.

- 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

mysql-test/r/select.result:
  Update results
mysql-test/t/select.test:
  Remove regression test
sql/item_cmpfunc.cc:
  Revert patch for checking length of ESCAPE, it is not correct.

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

sql/item_strfunc.cc:
  Fix bad merge

include/my_global.h:
  Add distinct set_timespec_nsec() macro for when HAVE_TIMESPEC_TS_SEC
  is defined.

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


sql/sql_parse.cc:
  Auto merged

mysql-test/t/kill.test:
  Moved --disable_reconnect earlier to avoid race condition
sql/sql_help.cc:
  Cleanup during review of new code
  (Moved variable definitions first in function
sql/sql_insert.cc:
  Cleanup during review of new code
sql/sql_lex.cc:
  Cleanup during review of new code
sql/sql_parse.cc:
  Cleanup during review of new code
  Changed potential problem with previous_table_ref where it dependent that TABLE_LIST first element would be next_local
  Rearanged code in add_table_to_list() to remove extra if
  Combined 2 calls to calloc() to one
sql/sql_view.cc:
  Remove extra indentation level
  Combined common 'on error' exit
sql/sql_yacc.yy:
  Fixed comment style
sql/table.cc:
  Cleanup during review of new code
  - Changed while() loops to for() loop (to make code more readable)
  - Removed not needed initialization of variables
  - Removed not needed 'else' cases
  - Removed trivial ASSERT's that was checked by previous code
  - Moved comment setting last in Natural_join_column::check_grants()

into  mysql.com:/home/alexi/mysql-5.0

mysql-test/r/show_check.result:
  results for test for bug #12591
mysql-test/t/show_check.test:
  test for bug #12591
sql/sql_show.cc:
  don't let my_dir() emit a message bug catch the errno (my_errno - a thread specific variable) and check it for ENOENT - not existing.
  For other errors emulate the message used to be emitted by my_dir()

  Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)


innobase/include/univ.i:
  Do not use __builtin_expect etc. with the Intel ICC compiler, as the compiler crashed in btr0cur.c; the patch was submitted by Axel Schwenke (Bug #11510)

into  mysql.com:/home/alexi/dev/mysql-5.0-1

into  mysql.com:/home/alexi/mysql-5.0


mysql-test/t/select.test:
  Auto merged

- fixed a problem with RIGHT JOIN ON and enabled corresponding tests in select.test
- fixed a memory leak


mysql-test/r/select.result:
  Fixed a problem with RIGHT JOIN ON queries, enabling the corresponding tests.
mysql-test/t/select.test:
  Fixed a problem with RIGHT JOIN ON queries, enabling the corresponding tests.
sql/sql_base.cc:
  Fixed a problem with RIGHT JOINs that have operand(s) which are NATURAL JOIN(s).
sql/table.h:
  Inherit from Sql_alloc for proper memory allocation.
  The change fixes a memory leak.

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


sql/sql_base.cc:
  Auto merged

- Applied Monty's patch after his review of sql_base.cc


sql/sql_base.cc:
  Applied Monty's patch after his review of WL#2486.

into  zim.(none):/home/brian/mysql/mysql-5.0