into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


configure.in:
  Auto merged
include/config-win.h:
  Auto merged
include/m_string.h:
  Auto merged
include/my_pthread.h:
  Auto merged
myisam/mi_search.c:
  Auto merged
mysql-test/r/cast.result:
  Auto merged
mysql-test/t/cast.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
netware/pack_isam.def:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/xml.c:
  Auto merged
vio/vio.c:
  Auto merged
vio/viosocket.c:
  Auto merged
mysql-test/r/select.result:
  Merged from 4.1.
netware/BUILD/mwenv:
  Merged from 4.1.
scripts/make_binary_distribution.sh:
  Merged from 4.1.
sql/mysqld.cc:
  Merged from 4.1.
sql/sql_show.cc:
  Merged from 4.1.
strings/my_strtoll10.c:
  Merged from 4.1.

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp

netware/BUILD/mwenv:
  Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
  NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
  Netware specific change for creating help tables.
strings/my_strtoll10.c:
  Fix for Metrowerks compiler.

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


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

into moonbone.local:/work/7672-bug-5.0-mysql

VC++Files/mysql.sln:
  Auto merged
mysql-test/t/func_group.test:
  Auto merged

into mysql.com:/Users/kent/mysql/bk/mysql-4.1

sql/sql_lex.h:
  Auto merged

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

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


mysql-test/t/kill.test:
  Auto merged

mysql-test/t/cast.test:
  Auto merged
sql/item.h:
  Auto merged

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


sql/item_strfunc.cc:
  Auto merged

Updated more DDL statements to cause implicit commit.


mysql-test/r/rpl_ddl.result:
  updated results to test for implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
mysql-test/t/rpl_ddl.test:
  updated results to test for implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER
sql/sql_parse.cc:
  added implicit commit for:
  CREATE OR REPLACE VIEW
  ALTER VIEW
  DROP VIEW
  CREATE TRIGGER
  DROP TRIGGER
  CREATE USER
  RENAME USER
  DROP USER

into  mysql.com:/usr/home/bar/mysql-4.1.b12476

strings/ctype-tis620.c:
  memcpy_overlap() replaced with memmove() during the merge.

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


sql/sql_select.cc:
  Auto merged

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

The bug was in JOIN::join_free which was wrongly determining that
all joins have been already executed and therefore all used tables
can be closed.


mysql-test/r/subselect_innodb.result:
  - test results fixed (Bug#12736 "Server crash during a select
mysql-test/t/subselect_innodb.test:
  - a test case for Bug#12736 "Server crash during a select": test
  that ha_index_or_rnd_end and mysql_unlock_tables are called
  for all used tables in proper order.
sql/item_subselect.cc:
  - implement subselect_union_engine::is_executed
sql/item_subselect.h:
  - implement Item_subselect::is_evaluated. This function is used
  to check whether we can clean up a non-correlated join of a subquery
  when cleaning up the join of the outer query
sql/sql_lex.h:
  - declare st_select_lex::cleanup_all_joins
sql/sql_select.cc:
  - remove an argument from JOIN::join_free, it's now not used
  - reimplement JOIN::join_free to not unlock tables if there
    is a subquery that has not yet been evaluated. Make sure that the
    new implementation calls ha_index_or_rnd_end for every table in
    the join and inner joins, because all table cursors must be closed
    before mysql_unlock_tables.
sql/sql_select.h:
  - JOIN::join_free signature changed
sql/sql_union.cc:
  - implement a helper method st_select_lex::cleanup_all_joins, which
    recursively walks over a tree of joins and calls cleanup() for
    each join.

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


myisam/mi_search.c:
  Auto merged
include/m_string.h:
  SCCS merged

into  mysql.com:/usr/home/bar/mysql-4.1.b12476


sql/item_cmpfunc.cc:
  Auto merged

Clean application of patch - 
- Added --tz-utc to fix issue of dumping timestamp values between 
servers with different global time zone settings, particularly 
with regard to the day of DST changeover, which without this fix,
 would dump duplicate timestamp values.


client/client_priv.h:
  BUG# 13052 - clean application of http://lists.mysql.com/internals/30993
client/mysqldump.c:
  BUG# 13052
  
  Clean application of patch http://lists.mysql.com/internals/30993
  
  - added new --tz-utc option
  - added saving of TIME_ZONE in dump file
  - set TIME_ZONE to "+00:00" in dump
mysql-test/r/mysqldump.result:
  BUG# 13052 New results
mysql-test/t/mysqldump.test:
  BUG# 13052
  
  Added new test to test if the new option --tz-utc places 
  'SET TIME_ZONE="+00:00" at the top of the file and that this fixes 
  the problem of ending up with duplicate timestamp values that should
   be unique on eve of DST

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

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

into  mysql.com:/home/mysql_src/mysql-5.0

mysql-test/r/subselect.result:
  correcting non-ascii chars hosed by automerge as usual
mysql-test/t/subselect.test:
  correcting non-ascii chars hosed by automerge as usual
sql/log_event.cc:
  correcting bad manual merge. ZERO_LEN is not needed in 5.0, as ::exec_event() just tell()s the relay log instead
  of using get_event_len().
sql/log_event.h:
  get_event_len() is not needed in 5.0, ZERO_LEN neither.
sql/slave.cc:
  fixes to take into account 5.0 specificities in replication. ZERO_LEN is not needed.

so a typo on flags will go unnoticed; I put flags in this my_free() definition (as a no-op which
will still make the compiler check correctness of the flags). Applied: this caught a typo in my_realloc.c. Kindly approved by Konstantin and Mats.


include/my_sys.h:
  When we define my_free(PTR,FG) to be my_no_flags_free(PTR) we don't make the compiler check
  correctness of FG, which can hurt if another person build with a different definition of my_free;
  so I add FG in the expression.
mysys/my_realloc.c:
  typo found by the change in my_sys.h :)

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

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

into  mysql.com:/home/mysql_src/mysql-5.0

(problem found by kent)


mysql-test/r/federated.result:
  replace port number with a named identifier
mysql-test/t/federated.test:
  add call to replace the resulting display of the port number with a string

into  mysql.com:/home/mysql_src/mysql-5.0

sql/item.cc:
  Auto merged

into  mysql.com:/home/dlenev/src/mysql-5.0-repl

  Bug #7672 after merge fix


sql/item.cc:
  Bug #7672 after merge fix
sql/sql_lex.cc:
  Bug #7672 after merge fix
sql/sql_select.cc:
  Bug #7672 after merge fix
mysql-test/t/select.test:
  Bug #7672 after merge fix

  Copy *.cnf files in mysql-test/std_data/
Makefile.am:
  Added std_data/*.cnf to copy ndb config


mysql-test/Makefile.am:
  Added std_data/*.cnf to copy ndb config
scripts/make_binary_distribution.sh:
  Copy *.cnf files in mysql-test/std_data/

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

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

To force a restart at the end of test, the option file must be non-empty, it's not enough if it exists and is empty.


mysql-test/t/rpl_dual_pos_advance-master.opt:
  the option file must be non-empty (because there's a -z test in mysql-test-run)

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


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged