syntax in binlog which stops replication":
disallow the use of parameter markers which can lead to generation
of malformed binlog queries. 


mysql-test/r/ps.result:
  Test results fixed: a test case for Bug#11299
mysql-test/t/ps.test:
  A test case for Bug#11299
sql/sql_lex.cc:
  Introduce a new parser token for a parameter marker. Make sure
  that a parameter marker can not be used in a query which, when
  transformed to a binlog query, becomes grammatically incorrect.
sql/sql_yacc.yy:
  The check for COM_PREPARE has been moved into the lexer.
mysql-test/var:
  New BitKeeper file ``mysql-test/var''

information about error".


libmysql/libmysql.c:
  Clear the last error on the statement if mysql_stmt_reset succeeded.
tests/mysql_client_test.c:
  A test case for Bug#11183 "mysql_stmt_reset() doesn't reset information 
  about error"

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

into mysql.com:/home/psergey/mysql-4.1-merge-from-build


sql/item_func.cc:
  Auto merged

  source table present (this happens for ORDER BY after UNION)


mysql-test/r/fulltext_order_by.result:
  Testcase for BUG#11869
mysql-test/t/fulltext_order_by.test:
  Testcase for BUG#11869

  This is needed because in some cases range optimization is performed twice and added 
  NOT NULL item must have correct const_table_map() value. 


mysql-test/r/select.result:
  Testcase for BUG#11700
mysql-test/t/select.test:
  Testcase for BUG#11700

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

No separate typecode for MEDIUMTEXT/LONGTEXT is added, as we
have no sound decision yet what typecodes and for what types are
sent by the server (aka what constitutes a distinct type in MySQL).



mysql-test/r/ps_2myisam.result:
  Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_3innodb.result:
  Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_4heap.result:
  Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_5merge.result:
  Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_6bdb.result:
  Test results fixed: new longtext/longblob length (2^32)
mysql-test/r/ps_7ndb.result:
  Test results fixed: new longtext/longblob length (2^32)
sql/field.cc:
  A fix for Bug#9735 "mysql_fetch_fields() acts strange on 
  LONGBLOB/LONGTEXT": fix wrong initialization of field_length
  in case of BLOB fields.
tests/mysql_client_test.c:
  A test case for Bug#9735  "mysql_fetch_fields() acts strange on 
  LONGBLOB/LONGTEXT"

into  mysql.com:/usr/home/bar/mysql-4.1.num-conv


mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/t/ctype_utf8.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_table.cc:
  Auto merged

character set is UCS2".
The bug is no longer repeatable.


mysql-test/r/ps.result:
  Test results fixed (a test case for Bug#9442)
mysql-test/t/ps.test:
  A test case for Bug#9442 "Set parameter make query fail if column 
  character set is UCS2

binary).


mysql-test/r/ps.result:
  Test results fixed (Bug#9379)
mysql-test/t/ps.test:
  A test case for Bug#9379 (collation of a parameter marker is binary)
sql/item.cc:
  - set Item_param::collation to str_value collation, if Item_param
  is assigned a string. Reset it to default in Item_param::reset() (on 
  the next execution it can be assigned a number).
sql/item_func.cc:
  - now that item collation can change between executions
  (if this item is Item_param), we need to register the change
  of the execution tree in the rollback list.

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

  adding test case
sql_table.cc:
  sql_table.cc:
  - do not create a new item when charsets are the same
  - return ER_INVALID_DEFAULT if default value cannot
    be converted into the column character set.
item.cc:
  - Allow conversion not only to Unicode,
    but also to and from "binary".
  - Adding safe_charset_converter() for Item_num
    and Item_varbinary, returning a fixed const Item.


sql/item.cc:
  - Allow conversion not only to Unicode,
    but also to and from "binary".
  - Adding safe_charset_converter() for Item_num
    and Item_varbinary, returning a fixed const Item.
sql/sql_table.cc:
  sql_table.cc:
  - do not create a new item when charsets are the same
  - return ER_INVALID_DEFAULT if default value cannot
    be converted into the column character set.
mysql-test/r/ctype_utf8.result:
  adding test case

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