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


mysql-test/t/analyse.test:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
mysql-test/r/analyse.result:
  Merge from 4.1

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

into  frost.snake.net:/Volumes/frost2/MySQL/bk/mysql-5.0

into  mysql.com:/users/lthalmann/bk/mysql-5.0


mysql-test/r/insert_select.result:
  Auto merged
mysql-test/t/insert_select.test:
  Auto merged
sql/sql_parse.cc:
  Manual marge

sql/sql_parse.cc:
  Optimization, this reset is executed below anyway

  Fix typo.


server-tools/instance-manager/options.cc:
  Fix typo.

into  snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

  Fix some comments.


extra/comp_err.c:
  Fix some comments.

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

into mysql.com:/home/psergey/mysql-5.0-merge

mysql-test/r/mysqldump.result:
  BUG #12597 - new results file because of merge of test and results file

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597


client/mysqldump.c:
  Auto merged
mysql-test/r/mysqldump.result:
  resolving conflicts in order to push for bug #12597
mysql-test/t/mysqldump.test:
  resolving conflicts for pushing to bug #12597

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0

into moonbone.local:/work/12695-bug-4.1-mysql

  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.


mysql-test/t/insert_select.test:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.
mysql-test/r/insert_select.result:
  Customer's test case for bug#12695 Item_func_isnull::update_used_tables() did 
  not update const_item_cache.

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0


ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug12597

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

into  mysql.com:/home/alexi/dev/mysql-4.1-12101

Added test case.

into  c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594

into mysql.com:/home/psergey/mysql-5.0-merge

into  radha.local:/Users/patg/mysql-build/mysql-5.0.bug9056

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


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

into mysql.com:/home/psergey/mysql-5.0-merge

thd->user_var_events_alloc (and so get binlog events to be allocated on its pool), 
clean the binlog events after the execution of this SP statement is finished.

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


sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged

sql/item_cmpfunc.cc:
  Modified Item_func_between::print(), Item_func_in::print().
  Item_func_between/in objects represent now [NOT]BETWEEN/IN expressions.

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

tests/mysql_client_test.c:
  Auto merged

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

into mysql.com:/home/psergey/mysql-5.0-merge


mysql-test/r/group_by.result:
  Auto merged
mysql-test/t/group_by.test:
  Auto merged