into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0


BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f:
  Auto merged
BitKeeper/etc/config:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlcheck.c:
  Auto merged
BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqlshow.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
myisam/myisampack.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysql_test_run.c:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqld_safe.c:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
sql/ha_blackhole.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
client/client_priv.h:
  Merged from 4.1
client/mysqladmin.cc:
  Merged from 4.1
client/mysqlbinlog.cc:
  Merged from 4.1
mysys/charset.c:
  Merged from 4.1

mysys/my_alloc.c:
  Auto merged
sql/sql_table.cc:
  Auto merged

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0


sql/sql_show.cc:
  Auto merged

into  radha.local:/Users/patg/mysql-build/mysql-4.1

sql/ha_blackhole.cc:
  Blackhole Lock changes to blackhole per Brian, reapplied
sql/ha_blackhole.h:
  blackhold lock changes added per brian

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1

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

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


sql/item_func.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged

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

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


sql/sql_view.cc:
  Auto merged
mysql-test/r/view.result:
  merge
mysql-test/t/view.test:
  merge

into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333


sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sp_head.cc:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-bug12335-release2

BUG#12335: merging: temporarily removed a test case that demonstrates wrong behaviour and does it in non-deterministic way.

into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333

  Fix typo


sql/ha_innodb.cc:
  Fix typo

into mysql.com:/home/psergey/mysql-5.0-bug12335-release2


sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

"Interleaved SPs execution is now binlogged properly, "SELECT spfunc()" is binlogged too.
The known remaining issue is binlogging/replication of "a routine is deleted while it is executed" scenario.


mysql-test/r/rpl_sp.result:
  Fix for BUG#12335: updated test cases/results
mysql-test/t/rpl_sp.test:
  Fix for BUG#12335: updated test cases/results
sql/item.cc:
  Fix for BUG#12335 (SP replication): 
   - Added Item_name_const 'function'
   - Addede 'delete reuse' to call dtor on item reuse
sql/item.h:
  Fix for BUG#12335 (SP replication) : Added Item_name_const 'function' + code cleanup
sql/item_create.cc:
   Fix for BUG#12335 (SP replication) : Added Item_name_const 'function'
sql/item_create.h:
   Fix for BUG#12335 (SP replication) : Added Item_name_const 'function'
sql/item_func.cc:
  Fix for BUG#12335 (SP replication) : binary log is now constrolled from within execute_function.
sql/lex.h:
  Fix for BUG#12335 (SP replication) : Added Item_name_const 'function'
sql/log.cc:
  Fix for BUG#12335 (SP replication) : Added MYSQL_LOG::{start|stop}_union_events to allow
  one to temporary disable binlogging but collect a 'union' information about binlog write
  calls.
sql/mysql_priv.h:
  Fix for BUG#12335 (SP replication)
sql/sp_head.cc:
  Fix for BUG#12335 (SP replication) : Now we use different SP binlogging strategy, grep for 
  StoredRoutinesBinlogging for details
sql/sp_head.h:
  Comments added
sql/sp_pcontext.h:
  Comments added
sql/sp_rcontext.h:
  Comments added
sql/sql_class.cc:
  Fix for BUG#12335 (SP replication) : Now we use different SP binlogging strategy, grep for 
  StoredRoutinesBinlogging for details
sql/sql_class.h:
  Fix for BUG#12335 (SP replication) : Added MYSQL_LOG::{start|stop}_union_events to allow
  one to temporary disable binlogging but collect a 'union' information about binlog write
  calls.
sql/sql_delete.cc:
  Fix for BUG#12335: check THD::query_str_binlog_unsuitable when writing to binlog.
sql/sql_insert.cc:
  Fix for BUG#12335: check THD::query_str_binlog_unsuitable when writing to binlog.
sql/sql_lex.cc:
  Fix for BUG#12335 (SP replication): Add ability to extract previous returned token from
  the tokenizer.
sql/sql_lex.h:
  Fix for BUG#12335 (SP replication): Add ability to extract previous returned token from
  the tokenizer.
sql/sql_parse.cc:
  Fix for BUG#12335 (SP replication) : Now we use different SP binlogging strategy, grep for 
  StoredRoutinesBinlogging for details
sql/sql_update.cc:
  Fix for BUG#12335: check THD::query_str_binlog_unsuitable when writing to binlog.
sql/sql_yacc.yy:
  Fix for BUG#12335 (SP replication) : When creating Item_splocal, remember where it is located
  in the query.

into mysql.com:/M50/mysql-5.0

into mysql.com:/M50/mysql-5.0

into  mysql.com:/home/cps/mysql/devel/mysql-5.0-sp11333


mysql-test/r/sp.result:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sp_head.cc:
  manual merge

into  eel.(none):/home/jonas/src/mysql-5.0-push

into  eel.(none):/home/jonas/src/mysql-4.1-push

into  eel.(none):/home/jonas/src/mysql-5.0-push

into  eel.(none):/home/jonas/src/mysql-4.1-push

mysql-test/r/sp.result:
  update result
mysql-test/t/sp.test:
  Add test for Bug #11333 "Stored Procedure: Memory blow up on repeated SELECT ... INTO query"
sql/item.cc:
  we should call destructors for Items before reuse
sql/item.h:
  Add new method and constructor for Item_string.
sql/sp_head.cc:
  String allocation should be done on the system heap for now.

into  eel.(none):/home/jonas/src/mysql-5.0


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  merge

  When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)


ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  bug#12027 
    When detecting corrupt schema file.
    Make sure to close it (as it will be opened later when rewriting a clean copy)

into  127.(none):/home/osku/mysql-5.0-2

  updated tomas default checkout


BitKeeper/etc/config:
  updated tomas default checkout

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

  changed tomas default checkout


BitKeeper/etc/config:
  changed tomas default checkout

Makefile.am:
  Manual merge from 4.1 - change is already present, as 4.1 had a backport.

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1


client/mysqlcheck.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
extra/my_print_defaults.c:
  Auto merged
extra/perror.c:
  Auto merged
extra/resolve_stack_dump.c:
  Auto merged
include/help_end.h:
  Auto merged
include/help_start.h:
  Auto merged
isam/isamchk.c:
  Auto merged
isam/pack_isam.c:
  Auto merged
myisam/myisamlog.c:
  Auto merged
netware/myisamchk.def:
  Auto merged
netware/mysql.def:
  Auto merged
netware/mysqladmin.def:
  Auto merged
netware/mysqlbinlog.def:
  Auto merged
netware/mysqlcheck.def:
  Auto merged
netware/mysqldump.def:
  Auto merged
netware/mysqlimport.def:
  Auto merged
netware/mysqlshow.def:
  Auto merged
client/client_priv.h:
  Merged from 4.0.
client/mysql.cc:
  Merged from 4.0.
client/mysqladmin.cc:
  Merged from 4.0.
client/mysqlbinlog.cc:
  Merged from 4.0.
client/mysqldump.c:
  Merged from 4.0.
client/mysqlshow.c:
  Merged from 4.0.
myisam/myisamchk.c:
  Merged from 4.0.
myisam/myisampack.c:
  Merged from 4.0.
netware/mysql_test_run.c:
  Merged from 4.0.
netware/mysqld_safe.c:
  Merged from 4.0.
sql/mysqld.cc:
  Merged from 4.0.

mysql-test/r/information_schema.result:
  Ensure that rows are in given order
mysql-test/t/information_schema.test:
  Ensure that rows are in given order

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

into lmy004.:/work/mysql-5.0-bug12533-2


mysql-test/r/view.result:
  Auto merged
sql/sql_show.cc:
  Auto merged