into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0


include/my_global.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-5.0


mysql-test/r/myisam.result:
  Manual merge.
mysql-test/t/myisam.test:
  Manual merge.
sql/sql_update.cc:
  Manual merge.

into  may.pils.ru:/home/svoj/devel/mysql/BUG18036/mysql-4.1

Certain updates of table joined to self results in unexpected
behavior.

The problem was that record cache was mistakenly enabled for
self-joined table updates. Normally record cache must be disabled
for such updates.

Fixed wrong condition in code that determines whether to use
record cache for self-joined table updates.

Only MyISAM tables were affected.


mysql-test/r/myisam.result:
  Test case for BUG#18036.
mysql-test/t/myisam.test:
  Test case for BUG#18036.
sql/sql_update.cc:
  Fixed wrong condition in code that determines whether to use
  record cache for self-joined table updates.

into moonbone.local:/work/tmp_merge-5.0-opt-mysql

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

into moonbone.local:/work/tmp_merge-4.1-opt-mysql

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


ndb/Makefile.am:
  Auto merged

  Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile


BUILD/compile-dist:
  Avoid error message for target 'distclean' and no Makefile
ndb/Makefile.am:
  Avoid error message trying 'windoze-dsp' in obsolete directory

into  clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285

ndb/src/ndbapi/NdbBlob.cpp:
  bug#19285 minor fixes
ndb/src/ndbapi/ndberror.c:
  bug#19285 minor fixes

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


scripts/make_win_src_distribution.sh:
  Auto merged

  Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt


scripts/make_win_src_distribution.sh:
  Make output less verbose
  Make temporary directory name unique
  Remove temporary directory on interrupt

  Don't try copy non existing extra/{sql_state,mysqld_error}.h


scripts/make_win_src_distribution.sh:
  Don't try copy non existing extra/{sql_state,mysqld_error}.h

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


scripts/make_win_src_distribution.sh:
  Auto merged

  Include "sql_yacc.yy" for completeness (bug#20387)


scripts/make_win_src_distribution.sh:
  Include "sql_yacc.yy" for completeness (bug#20387)
  Improved error handling
  Don't list all files packed with tar/zip unless debugging

BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
  Auto merged

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


configure.in:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/r/auto_increment.result:
  Auto merged
mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/ndb_lock.result:
  Auto merged
mysql-test/r/rpl_log.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/archive.test:
  Auto merged
mysql-test/t/auto_increment.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/ndb_lock.test:
  Auto merged
mysql-test/t/rpl_log.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

  After merge fix


mysql-test/r/select.result:
  After merge fix

  Changes for Netware


sql/net_serv.cc:
  Netware needs <sys/select.h>
configure.in:
  Call of "comp_err" has moved, changed code for Netware that
  edits make files to reflect this
netware/BUILD/compile-netware-END:
  After correcting "configure.in" to edit make files correctly,
  removed obsolete "sed" of "extra/Makefile.am" for Netware

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

into moonbone.local:/work/tmp_merge-5.0-opt-mysql


mysql-test/r/cast.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_cmpfunc.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

configure.in:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged

  Delete: netware/mysql_install.def
Makefile.am:
  Removed obsolete "mysql_install.def"


netware/Makefile.am:
  Removed obsolete "mysql_install.def"
BitKeeper/deleted/.del-mysql_install.def~8da659e7c0f7e571:
  Delete: netware/mysql_install.def

  Fix for bug#16716 for --ps-protocol mode.
item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type() after fix
for bug#16377. Few language corrections.


sql/item_cmpfunc.cc:
  Fix for a memory allocation/freeing problem in agg_cmp_type(). Few language corrections.
sql/item_strfunc.cc:
  Fix for bug#16716 for --ps-protocol mode.

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


mysql-test/mysql-test-run.pl:
  Auto merged

Set default valgrind options to "-v --show-reachable=yes" and make it possible to override that with --valgrind-options 


mysql-test/mysql-test-run.pl:
  Make --valgrind-all a synonym for --valgrind.
  Set "-v --show-reachable=yes" as our default valgrind options. 
  Make --valgrind-options override the default options
  Update usage.
  Turn on valgrinding also when user specified --valgrind-path or --valgrind-options without --valgrind

into  mysql.com:/usr/home/ram/work/mysql-5.0

into  mysql.com:/usr/home/ram/work/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

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

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


ndb/src/mgmsrv/MgmtSrvr.cpp:
  Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
  Auto merged
ndb/src/mgmsrv/Services.cpp:
  Auto merged

into  mysql.com:/usr/home/ram/work/mysql-5.0

mysql-test/r/rpl_log.result:
  after-merge fix.
sql/ha_archive.cc:
  after-merge fix.
sql/item_func.cc:
  after-merge fix.
sql/sql_class.cc:
  after-merge fix.
sql/sql_class.h:
  after-merge fix.

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


mysql-test/r/ctype_sjis.result:
  Auto merged
mysql-test/t/ctype_sjis.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

Don't rely on table->null_row when no index is used - it may be a multi-table search

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


mysql-test/t/func_group.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged
mysql-test/r/func_group.result:
  SCCS merged

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


sql/field.cc:
  Auto merged
sql/opt_sum.cc:
  Auto merged