The problem was that on Windows, the socket was in a blocking state 
trying to read.  Setting killed=1 is not enough to break the 
socket out of it's read loop.   You have to cancel the read request
or close the socket (which close_connection does).


sql/mysqld.cc:
  call close_connection on the thread instead of setting killed=1

into  mysql.com:/opt/local/work/mysql-4.1-11458

configure.in:
  Increase version number to 4.1.14, as the clone for 4.1.13 has been created.

into  mysql.com:/opt/local/work/mysql-4.1-11458


sql/mysql_priv.h:
  Auto merged

data": remove the fix for another bug (8807) that
added OUTER_REF_TABLE_BIT to all subqueries that used a placeholder
to prevent their evaluation at prepare. As this bit hanged in 
Item_subselect::used_tables_cache for ever, a constant subquery with
a placeholder was never evaluated as such, which caused wrong 
choice of the execution plan for the statement.
- to fix Bug#8807 backport a better fix from 5.0
- post-review fixes.


mysql-test/r/ps.result:
  Bug#11458: test results fixed
mysql-test/t/ps.test:
  - add a test case for Bug#11458 "Prepared statement with subselects return 
  random data"
sql/item.cc:
  - remove unnecessary Item_param::fix_fields
  - fix Item_param::set_null to set item_type accordingly (safety:
    Item_param should behave like a basic constant).
sql/item.h:
  Remove Item_param::fix_fields
sql/item_subselect.h:
  Remove no more existing friend.
sql/mysql_priv.h:
  Add UNCACHEABLE_PREPARE to mark all subqueries as uncacheable if
  in statement prepare (backport from 5.0).
sql/sql_lex.h:
  Comment fixed.
sql/sql_parse.cc:
  If in statement prepare, mark all subqueries as uncacheable (backport
  from 5.0)
sql/sql_prepare.cc:
  Switch off the uncacheable flag from all subqueries after statement
  prepare is done (backport from 5.0)

end of the test, causing subsequent tests to fail.


mysql-test/r/rpl_deadlock.result:
  Result change.
mysql-test/t/rpl_deadlock.test:
  Tables used in the test but not dropped.

  added out of range handling

include/my_global.h:
  set SOCKET_EWOULDBLOCK to the proper windows def WSAEWOULDBLOCK
sql/net_serv.cc:
  fixed typo with using 3 leading underscores instead of 2
vio/vio.c:
  fixed typo with using 3 leading underscores instead of 2
vio/viosocket.c:
  fixed typo with using 3 leading underscores instead of 2

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

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


sql/item_strfunc.cc:
  Auto merged
BitKeeper/etc/config:
  Resolve conflict

into  mysql.com:/home/bk/b6987-mysql-4.1

into mysql.com:/M41/mysql-4.1

into  mysql.com:/home/bk/b6987-mysql-4.1

into mysql.com:/home/psergey/mysql-4.1-bug11821

  MAX(field).


mysql-test/r/subselect.result:
  Testcase for BUG#11821
mysql-test/t/subselect.test:
  Testcase for BUG#11821

into  mysql.com:/home/bk/b6987-mysql-4.1

into  mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

sql/log.cc:
  Added a note when stat failed on log file
sql/slave.cc:
  Added mutex for relay log rotation

include/my_global.h:
  Fix for gcc 4.0 (they removed min/max)

zlib/inftrees.c:
  Apply security patch for CAN-2005-2096

cmd-line-utils/libedit/chared.c: Fix compile problem caused by use of "uint" which is undefined on QNX.


cmd-line-utils/libedit/chared.c:
  Re-apply vva's fix:
  cmd-line-utils/libedit/chared.c@1.4, 2004-08-31 17:50:59+05:00, vva@eagle.mysql.r18.ru
    discarded using of uint because it's undefined on qnx

  Identation fix


sql/field_conv.cc:
  Identation fix

  Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
ctype_utf8.result, ctype_utf8.test:
  adding test case


sql/field_conv.cc:
  Bug#11591
  CHAR column with utf8 does not work properly
  (more chars than expected)
  do_cut_string didn't call well_formed_length,
  and copied all data, which was wrong in the
  case of multibyte character set.
mysql-test/t/ctype_utf8.test:
  adding test case
mysql-test/r/ctype_utf8.result:
  adding test caser

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

  at all)

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

  Corrected libs and lib search path for debug target


VC++Files/tests/mysql_client_test.dsp:
  Corrected libs and lib search path for debug target

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

mysql-test/Makefile.am:
  - added mysql-test/t/*.def to the source distribution and make sure that "make install"
    installs it, too.
scripts/make_binary_distribution.sh:
  - added mysql-test/t/*.def to the binary distribution

option having been passed to the server. (Bug #11643)


sql/des_key_file.cc:
  Split initialization of mutex to new function, and make sure static
  initialization variable is initialized.
sql/item_strfunc.cc:
  Make sure to initialize mutex before using it
sql/mysql_priv.h:
  Add init_des_key_file() declaration
mysql-test/r/func_des_encrypt.result:
  New BitKeeper file ``mysql-test/r/func_des_encrypt.result''
mysql-test/t/func_des_encrypt.test:
  New BitKeeper file ``mysql-test/t/func_des_encrypt.test''
BitKeeper/etc/config:
  Disable openlogging

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

  Added support for the disabled.def file


mysql-test/lib/mtr_cases.pl:
  Added support for the disabled.def file

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

  - Change output from SHOW CREATE TABLE to use USING instead of TYPE


mysql-test/r/ctype_utf8.result:
  Update test results
mysql-test/r/show_check.result:
  Update test results
mysql-test/r/sql_mode.result:
  Update test results
mysql-test/t/show_check.test:
  Add test for BUG#11635
sql/sql_show.cc:
  Change TYPE to USING as output from SHOW CREATE TABLE

into  zim.(none):/home/brian/mysql/mysql-4.1


BitKeeper/etc/config:
  Auto merged

vio/viossl.c:
  Typo for dbug code
BitKeeper/etc/config:
  turned off openlogging

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