mysql-test/t/sp-code.test:
  Corrected typo in comment.

  Second version.
  The problem was that the optimizer didn't work correctly with forwards jumps
  to "no-op" hpop and cpop instructions.
  Don't generate "no-op" instructions (hpop 0 and cpop 0), it isn't actually
  necessary.


mysql-test/r/sp-code.result:
  Updated results for new test case (BUG#15737)
mysql-test/t/sp-code.test:
  New test case (BUG#15737)
sql/sp_head.cc:
  Removed backpatch methods from sp_instr_hpop/cpop, since they're not needed any more.
  Added more documentation to sp_head::optimize()
sql/sp_head.h:
  Removed backpatch and opt_mark methods from sp_instr_hpop/cpop, since they're not needed
  any more.
  Added comments to optimizer methods in sp_instr.
sql/sql_yacc.yy:
  Don't generate "no-op" hpop and cpop instructions for LEAVE, it's not necessary.
  Just generate them when needed.

  - BUG#15166: Wrong update permissions required to execute triggers
  - BUG#15196: Wrong select permission required to execute triggers

The idea of the fix is to check necessary privileges
in Item_trigger_field::fix_fields(), instead of having "special variables"
technique. To achieve this, we should pass to an Item_trigger_field instance
a flag, which will indicate the usage/access type of this trigger variable.


mysql-test/r/trigger-grant.result:
  Update the result file.
mysql-test/t/trigger-grant.test:
  Add test cases for BUG#15166 and BUG#15196
sql/item.cc:
  Item_trigger_field: check appropriate (SELECT/UPDATE) privilege in fix_fields().
sql/item.h:
  Add a flag to specify access type for trigger field.
sql/sql_trigger.cc:
  "Special variable" technique of checking privileges for NEW/OLD variables
  was replaced by checking table- and column-level privileges in
  Item_trigger_field::fix_fields().
sql/sql_trigger.h:
  "Special variable" technique of checking privileges for NEW/OLD variables
  was replaced by checking table- and column-level privileges in
  Item_trigger_field::fix_fields().
sql/sql_yacc.yy:
  Specify access type for trigger fields.

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

  Fill schema tables with data before filesort if it's necessary


mysql-test/r/information_schema.result:
  Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
    test result
mysql-test/t/information_schema.test:
  Fix for bug#15307 GROUP_CONCAT() with ORDER BY returns empty set on information_schema(2nd ver)
    test case

into mysql.com:/home/gluh/MySQL/Merge/5.0

  to skip directories which are not allowed for read


mysql-test/r/information_schema.result:
  Fix for bug#15851 Unlistable directories yield no info from information_schema
    test result
mysql-test/t/information_schema.test:
  Fix for bug#15851 Unlistable directories yield no info from information_schema
    test case

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020

into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/mysql-5.0

zlib/Makefile.am:
  Added a reference to ../include for my_config.h
zlib/README.MySQL:
  Updated a readme file to emphasize which files we what to keep an eye on
  in case of zlib upgrade.
zlib/zconf.h:
  restored a code for standard platform dependant definitions

into  selena.:H:/MYSQL/src/#15787-mysql-5.0

into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0


myisam/ft_update.c:
  Auto merged
mysql-test/r/fulltext2.result:
  Auto merged

  
Since replication rules execute after `mysql_multi_update_prepare' returns we
delay to `break' in case this functions returns non-zero (some tables are not found) 
for to examine if there is an ignore rule for a not-found table. By doing that
it is guaranteed do/ignore replication rules logically preceed opening table routine.


sql/sql_parse.cc:
  BUG#15699. We delay to `break' in case of unexisted tables for multi-update.
  First it is checked whether an ignore rule for such a table exists.
  
  More to the fix:
  if (opt_readonly && ...' in two places got be idented because it were
  enclosed explicitly into corresponding `else' groups. For that 
  the preceding lines with `else' were changed in to be 
  `else 
   {'.
  This grouping is necessary to avoid any inattentive
  insertion in between of `else' and belonging to the else 
  `if (opt_readonly && ...' statement.
mysql-test/r/rpl_multi_update4.result:
  New BitKeeper file ``mysql-test/r/rpl_multi_update4.result''
mysql-test/t/rpl_multi_update4-slave.opt:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4-slave.opt''
mysql-test/t/rpl_multi_update4.test:
  New BitKeeper file ``mysql-test/t/rpl_multi_update4.test''

Fixed that UPDATE statement crashes multi-byte charset fulltext index.


myisam/ft_update.c:
  Fixed that UPDATE statement crashes multi-byte charset fulltext index.
  While updating, always rewrite multi-byte charset fulltext index.
mysql-test/r/fulltext2.result:
  Added a testcase for BUG#16489.
mysql-test/t/fulltext2.test:
  Added a testcase for BUG#16489.

into  neptunus.(none):/home/msvensson/mysql/bug14634/my50-bug14634


sql/sql_select.cc:
  Auto merged

into  zim.tangent.org:/home/brian/mysql/mysql-5.0

mysql-test/r/func_gconcat.result:
  merging
mysql-test/r/type_float.result:
  merging

mysql-test/ndb/ndbcluster.sh:
  Auto merged
mysql-test/r/func_gconcat.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/func_math.test:
  Auto merged
mysql-test/t/type_float.test:
  Auto merged
sql/spatial.h:
  Auto merged
mysql-test/r/type_float.result:
  merging
sql/item_func.cc:
  merging

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg

into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg


sql/item_func.cc:
  Auto merged

Turns out that the bulk interface was not well documented. I fixed the issue in archive and I will go and update the comments in handler next. I should probably also look through the other engines and see if this an issue elsewhere as well. 


sql/ha_archive.cc:
  Fixed for bulk_insert

in the Binary Log.


mysql-test/r/rpl_sp.result:
  Update result file.
mysql-test/t/rpl_sp.test:
  Add test case for BUG#16621: INSERTs in Stored Procedures causes data corruption
  in the Binary Log.

The bug appears after implementation of WL#2984
(Make stored routine variables work according to the standard).


mysql-test/r/type_varchar.result:
  Update result file.
mysql-test/t/type_varchar.test:
  Add a test for BUG#15588.
sql/field.cc:
  - use memmove() instead of memcpy() -- after implementation of WL#2984
    (Make stored routine variables work according to the standard) it is
    possible to store in the field the value from this field. For instance,
    this can happen for the following statement:
      SET sp_var = SUBSTR(sp_var, 1, 3);
sql/sp_head.cc:
  - Work correctly with String:
    - String length has to be be reset before use;
    - qs_append() does not allocate memory, so the memory should
      be reserved beforehand.
sql/sql_select.cc:
  Polishing: should have been done in WL#2984.

mysql-test/r/sp.result:
  Updated results.
mysql-test/t/sp.test:
  Actually change the fib(20) into fib(10).  (Doh!)

  Lowered the parameter to 10, and also renamed non-standard table names to t3.


mysql-test/r/sp.result:
  Updated results.
mysql-test/r/sp_trans.result:
  Updated results.
mysql-test/t/sp.test:
  Renamed fac, primes and fib tables to t3.
  Lowered fib() test parameter to 10 (20 hit the stack overrun check on some machines).
mysql-test/t/sp_trans.test:
  Added drop of t3 for safety. (Might be left from sp.test after certain test failures.)

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

sql/sp_head.cc:
  Post-review fix.
sql/sp_head.h:
  Post-review fix.
sql/sql_yacc.yy:
  Post-review fix.

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

into  mysql.com:/opt/local/work/mysql-5.0-root

into  mysql.com:/extern/mysql/work/bug15658/mysql-5.0

mysql-test/ndb/ndbcluster.sh:
  have made a real fix for mgmd not starting with --no-defaults. re-introduce it to the test suite

ndb/src/mgmsrv/main.cpp:
  fix --no-defaults option processing

into  mysql.com:/opt/local/work/mysql-5.0-root


mysql-test/ndb/ndbcluster.sh:
  Auto merged

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

mysql-test/ndb/ndbcluster.sh:
  small fix to make ndb_mgmd run
ndb/tools/ndb_size.pl:
  small typo

into  neptunus.(none):/home/msvensson/mysql/bug15020/my50-bug15020


sql/table.cc:
  Auto merged

into  mysql.com:/opt/local/work/mysql-5.0-root


sql/protocol.cc:
  Auto merged
tests/mysql_client_test.c:
  Manual merge.