into mysql.com:/home/pz/mysql/mysql-4.1-root

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


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

into mysql.com:/home/pz/mysql/mysql-4.1

into myvenu.com:/home/venu/work/sql/dev-4.1


sql/field.cc:
  Auto merged

  added test_xml


BitKeeper/etc/ignore:
  added test_xml

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk

into mysql.com:/home/pz/mysql/mysql-4.1

sql/item_strfunc.cc:
  Fix password() function according Monty's comment

into mysql.com:/home/pz/mysql/mysql-4.1

sql/item.cc:
  post-post-review fix
sql/item_cmpfunc.h:
  post-post-review fix
sql/item_row.cc:
  post-post-review fix
sql/item_subselect.cc:
  post-post-review fix

into mysql.com:/home/pz/mysql/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

reordered Item_row class variables to be sorted by memory size


mysql-test/r/subselect.result:
  fix result of subselect test
sql/item.cc:
  postreviews fix
sql/item.h:
  postreviews fix
sql/item_cmpfunc.h:
  postreviews fix
sql/item_row.cc:
  postreviews fix
sql/item_row.h:
  reordered class variables to be sorted by memory size
  postreviews fix
sql/item_strfunc.cc:
  postreviews fix
sql/item_subselect.cc:
  postreviews fix

outfile) class.

sql/mysqld.cc:
  Fixed duplicate of handle_count

sql/sql_udf.cc:
  Change locks to rw_locks

mysql-test/r/subselect.result:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_derived.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk

into myvenu.com:/home/venu/bk/src-4.1


sql/sql_table.cc:
  Auto merged

into mysql.com:/home/pz/mysql/mysql-4.1

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/field.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged

into mysql.com:/home/pz/mysql/mysql-4.1


sql/sql_parse.cc:
  Auto merged

sql/field.cc:
  Removing unreferenced local variables
sql/item.cc:
  Remove unreferenced local variable
sql/sql_parse.cc:
  Remove unreferenced local variable
sql/sql_select.cc:
  Remove unreferenced local variable
sql/sql_show.cc:
  Remove unreferenced local variable

into eagle.mysql.r18.ru:/home/vva/work/BINLOG_TEMPORARY/4.1


BitKeeper/etc/logging_ok:
  auto-union
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/work-row-4.1


sql/sql_yacc.yy:
  Auto merged

into sinisa.nasamreza.org:/mnt/work/mysql-4.1


sql/sql_parse.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

fix for a bug with derived tables and query cache
ix for a charset bug in timestamp


mysql-test/r/multi_update.result:
  aliases with multi-table updates / deletes
mysql-test/r/query_cache.result:
  fix for query cache with derived tables
mysql-test/t/multi_update.test:
  aliases with multi-table updates / deletes
mysql-test/t/outfile.test:
  Fix of bug with charset in timestamp
mysql-test/t/query_cache.test:
  fix for a bug with derived tables and query cache
sql/field.cc:
  fix for a charset bug in timestamp
sql/sql_parse.cc:
  aliases with multi-table updates / deletes
sql/sql_yacc.yy:
  aliases with multi-table updates / deletes