into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

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


sql/mysqld.cc:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

include/my_sys.h:
  Fixes from review (use version in log_event.cc instead)
mysql-test/r/ctype_cp932.result:
  Updated test for bug#11338 (logging of prepared statement w/ blob type)
mysql-test/t/ctype_cp932.test:
  udpated test for bug#11338 (logging of prepared statement w/ blob type)
mysys/charset.c:
  Fixes from review (use version in log_event.cc instead)
sql/item.cc:
  Fixes from review (store character_set_client differently so that
  fix can be merged forward to 5.0)
sql/item.h:
  Fixes from review
sql/log_event.cc:
  Fixes from review, str_to_hex is now used by item.cc
sql/log_event.h:
  Added prototype for str_to_hex (now used by item.cc)
sql/sql_prepare.cc:
  Fixes from review, store character_set_client differently so that 
  Item_param::query_val_str can use it.

  Added test cases for bug #12625.
sql_select.cc:
  Fixed bug #12625.
  Fixed invalid removal of constant items from the DISTINCT
  list in the function create_distinct_group.


sql/sql_select.cc:
  Fixed bug #12625.
mysql-test/r/distinct.result:
  Added test cases for bug #12625.
mysql-test/t/distinct.test:
  Added test cases for bug #12625.

sql/mysqld.cc:
  BUG #12498 Fixed Mispelled 'type'

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


netware/BUILD/nwbootstrap:
  Auto merged
sql/mysqld.cc:
  Auto merged
include/config-netware.h:
  Manual merge from 4.0 to 4.1.

against a later version of libc.


include/config-netware.h:
  Changes for Netware. Needed to build against newer libc.
netware/BUILD/nwbootstrap:
  Fix to build script.
sql/mysqld.cc:
  Added an include.

than we've used before.

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

into  linux.site:/home/reggie/bk/mysql-4.1

  Bug#12615: Host name might not resolve, use short host name


mysql-test/lib/mtr_misc.pl:
  Bug#12615: Host name might not resolve, use short host name
mysql-test/mysql-test-run.pl:
  Bug#12615: Host name might not resolve, use short host name

into  mysql.com:/Users/emurphy/src/work/mysql-4.1-bug11338


sql/item.h:
  Auto merged

In cp932, '\' character can be the second byte in a 
multi-byte character stream. This makes it difficult to use
mysql_escape_string. Added flag to indicate which languages allow
'\' as second byte of multibyte sequence so that when putting a prepared
statement into the binlog we can decide at runtime whether hex encoding
is really needed.


include/m_ctype.h:
  Added bool to indicate character sets which allow '\' as the second
  byte of a multibyte character set (currently only cp932). For these
  character sets, escaping with '\' is dangerous and leads to corruption
  in replication.
include/my_sys.h:
  Add function to enocde a string as hex with no prefix (bare)
mysys/charset.c:
  Add function to encode string as hex with no prefix (bare).
sql/item.cc:
  Check the connection character set to see if escape_string_for_mysql
  is safe, or if character set requires unambiguous (hex) encoding
sql/item.h:
  Pass thd to query_val_str for access to charset()
sql/sql_prepare.cc:
  Pass thd to query_val_str.
strings/ctype-big5.c:
  Add escape_with_backslash_is_dangerous flag.
strings/ctype-bin.c:
  Add escape_with_backslash_is_dangerous flag
strings/ctype-cp932.c:
  Add escape_with_backslash_is_dangerous flag.
strings/ctype-czech.c:
  Add escape_with_backslash_is_dangerous flag.
strings/ctype-euc_kr.c:
  Add escape_with_backslash_is_dangerous flag.
strings/ctype-extra.c:
  Add escape_with_backslash_is_dangerous flag.
strings/ctype-gb2312.c:
  Add escape_with_backslash_is_dangerous flag.
strings/ctype-gbk.c:
  Added escape_with_backslash_is_dangerous flag.
strings/ctype-latin1.c:
  Added escape_with_backslash_is_dangerous flag.
strings/ctype-sjis.c:
  Added escape_with_backslash_is_dangerous flag.
strings/ctype-tis620.c:
  Added esacpe_with_backslash_character_is_dangerous flag.
strings/ctype-uca.c:
  Added escape_with_backslash_is_dangerous flag.
strings/ctype-ucs2.c:
  Added escape_with_backslash_is_dangerous.
strings/ctype-ujis.c:
  Added escape_with_backslash_is_dangerous flag.
strings/ctype-utf8.c:
  Added escape_with_backslash_is_dangerous.
strings/ctype-win1250ch.c:
  Added escape_with_backslash_is_dangerous.

  Bug#11884: Corrected --start-and-exit, start the server
  as if the default/specified test case would have been run


mysql-test/mysql-test-run.pl:
  Bug#11884: Corrected --start-and-exit, start the server
  as if the default/specified test case would have been run

  Bug#11792: Check all of status code, to catch a crash as a failure
mtr_cases.pl:
  Code cleanup for skipped/disabled handling
mtr_process.pl:
  In debug mode, report if mysqladmin did not at least
  make the server stop listening to the port.
  Increased the time waiting for terminating to 20 seconds,
  to wait for really slow slave shutdown.
  Added call to start_reap_all(), to avoid zombies.
mtr_report.pl:
  Removed prototype for unused function mtr_report_test_disabled()


mysql-test/lib/mtr_report.pl:
  Removed prototype for unused function mtr_report_test_disabled()
mysql-test/lib/mtr_cases.pl:
  Code cleanup for skipped/disabled handling
mysql-test/lib/mtr_process.pl:
  Bug#11792: Check all of status code, to catch a crash as a failure

  Bug#12094: Let sleep_until_file_created() return the pid as intended


mysql-test/lib/mtr_process.pl:
  Bug#12094: Let sleep_until_file_created() return the pid as intended

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

into  mysql.com:/home/stewart/Documents/MySQL/4.1/bug11538


acinclude.m4:
  Auto merged

  Added missing drop statement
subselect.test:
  Added missing drop statement.


mysql-test/t/subselect.test:
  Added missing dro statement.
mysql-test/r/subselect.result:
  Added missing drop statement

  Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.
subselect.result, subselect.test:
  Added a test case for bug #11479.


mysql-test/t/subselect.test:
  Added a test case for bug #11479.
mysql-test/r/subselect.result:
  Added a test case for bug #11479.
sql/sql_select.cc:
  Fixed bug #11479.
  The JOIN::reinit method cannot call setup_tables
  after the optimization phase since this function
  removes some optimization settings for joined
  tables. E.g. it resets values of the null_row flag to 0.

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

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

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


sql/mysqld.cc:
  Auto merged

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

into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1

into  50.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-bug2-4.1

mysql-test/r/subselect.result:
  testst of IN subqueries with row
mysql-test/t/subselect.test:
  tests of ion subqueries with row
sql/item.h:
  add method to prevent of removing Item_ref_null_helper from HAVING
sql/item_cmpfunc.h:
  Prevented removing of Item_test_isnotnull from HAVING
sql/item_subselect.cc:
  fixed converting row IN subqueries
sql/sql_select.cc:
  fixed debug print

  Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)


sql/sql_parse.cc:
  Don't skip SET command even if --replicate-wild* says to.
  E.g., SET ONE_SHOT TIME_ZONE = 'XYZ' should be executed (BUG #12542)

-T option is used. (Bug #12235)


myisam/myisampack.c:
  Clean up temporary files when -T was used.

into mysql.com:/space/my/mysql-4.0-merge

into mysql.com:/space/my/mysql-4.1-merge

innobase/srv/srv0start.c:
  added line to error message clearly indicating that to get AWE support
  the user must compile InnoDB with __WIN2000__ defined.

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


sql/item_strfunc.cc:
  Auto merged

into mysql.com:/space/my/mysql-4.1-merge


support-files/MacOSX/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
support-files/MacOSX/postflight.sh:
  Auto merged

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

  preflight/postflight instead, so they are run every time a PKG is installed, not only for
  a fresh installation


support-files/MacOSX/Makefile.am:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/postflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
support-files/MacOSX/preflight.sh:
  - Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
    preflight/postflight instead, so they are run every time, not only for a fresh installation
  - fixed comment typo