into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb

into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-4.1/mysql-4.1-ndb

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-opt

into  bodhi.local:/opt/local/work/mysql-4.1-runtime

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt

into  dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-opt

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work

mysql-test/mysql-test-run.pl:
  remove dependency on Data::Dumper, it's not used anywhere

the problem is that client tools are compiled with UNDEF_THREADS_HACK
flag, and my thread-related additions to the mysqltest.c can't be compiled.
Easy solution is to disable these in not-embedded case completely.


client/mysqltest.c:
  it's used in embedded server only

into  bodhi.local:/opt/local/work/mysql-4.1-runtime


libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged

  If using \$(srcdir)/mysql.info in action, use same in rule.


Docs/Makefile.am:
  If using \$(srcdir)/mysql.info in action, use same in rule.

into  mysql.com:/home/kent/bk/mysql-4.1-merge

  BSD compatibility


Docs/Makefile.am:
  BSD compatibility

  Fix undefined behaviour.
Many files:
  Reenabled build outside ource tree


bdb/dist/gen_rec.awk:
  Fix undefined behaviour.
acinclude.m4:
  Reenabled build outside ource tree
configure.in:
  Reenabled build outside ource tree
libmysql_r/Makefile.am:
  Reenabled build outside ource tree
libmysqld/Makefile.am:
  Reenabled build outside ource tree
ndb/config/common.mk.am:
  Reenabled build outside ource tree
ndb/config/type_kernel.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapi.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitest.mk.am:
  Reenabled build outside ource tree
ndb/config/type_ndbapitools.mk.am:
  Reenabled build outside ource tree
ndb/config/type_util.mk.am:
  Reenabled build outside ource tree
ndb/src/kernel/Makefile.am:
  Reenabled build outside ource tree

mysql-test/lib/mtr_unique.pl:
  - add info message to mtr_require_unique_id_and_wait as suggested
  - fix for security issue
  - locks for pids of processes that don't exist anymore are reused, if ps is present and working as expected

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug21635


tests/mysql_client_test.c:
  Manual merge.

expression cols.

The problem was that MYSQL_FIELD::org_name was set for MIN() and MAX()
functions (COUNT() is also mentioned in the bug report but was already
fixed).

After this patch for expressions MYSQL_FIELD::name is set to either
expression itself or its alias, and other data origin fields of
MYSQL_FILED (db, org_table, table, org_name) are empty strings.


sql/item_sum.cc:
  For expressions only col_name should be non-empty string.
tests/mysql_client_test.c:
  Add test case for bug#21635: MYSQL_FIELD struct's member strings seem
  to misbehave for expression cols.

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23159

Make Prepared_stmt_count a global status variable, accessible via
SHOW STATUS LIKE 'Prepared_stmt_count';.  Documentation should be
updated.


mysql-test/r/ps.result:
  Update result for bug#16365: Prepared Statements: DoS with too many
  open statements, according to bug#23159: prepared_stmt_count should be
  status variable.
mysql-test/t/ps.test:
  Update test case for bug#16365: Prepared Statements: DoS with too many
  open statements, according to bug#23159: prepared_stmt_count should be
  status variable.
sql/mysqld.cc:
  Add Prepared_stmt_count as global status variable.
sql/set_var.cc:
  Remove prepared_stmt_count as system variable.

mysql-test/lib/mtr_unique.pl:
  Library file used by mysql-test-run.pl to determine unique test run identifiers.

include/mysql_h.ic:
  this one should actually be removed from the ABI

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug23383

mysql_stmt_affected_rows()

The problem was that affected_rows for prepared statement wasn't updated
in the client library on the error.  The solution is to always update
affected_rows, which will be equal to -1 on the error.


libmysql/libmysql.c:
  Update status variables even in the case of an error.  Some variables
  have a defined value on the error (like affected_rows is -1), others are
  undefined, so updating them won't harm.
libmysqld/lib_sql.cc:
  Update status variables even in the case of an error.  Some variables
  have a defined value on the error (like affected_rows is -1), others are
  undefined, so updating them won't harm.
tests/mysql_client_test.c:
  Add test for bug#23383: mysql_affected_rows() returns different values
  than mysql_stmt_affected_rows().

into  trift2.:/MySQL/M41/push-4.1

into  mysql.com:/home/hf/work/mysql-4.1-mrg


include/mysql.h:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/rename.test:
  Auto merged
mysql-test/t/subselect.test:
  Auto merged
sql-common/client.c:
  Auto merged
sql/sql_class.h:
  Auto merged
Makefile.am:
  merging
client/mysqltest.c:
  merging
mysql-test/t/mysql_client.test:
  merging

support-files/mysql.spec.sh:
  Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB) replace 
  "mysql-shared" (as distributed by SuSE) to allow easy upgrading (bug#22081).

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-4.1-bug17047

The problem was that some functions (namely IN() starting with 4.1, and
CHAR() starting with 5.0) were returning NULL in certain conditions,
while they didn't set their maybe_null flag.  Because of that there could
be some problems with 'IS NULL' check, and statements that depend on the
function value domain, like CREATE TABLE t1 SELECT 1 IN (2, NULL);.

The fix is to set maybe_null correctly.


mysql-test/r/func_in.result:
  Add result for bug#17047: CHAR() and IN() can return NULL without
  signaling NULL result.
mysql-test/t/func_in.test:
  Add test case for bug#17047: CHAR() and IN() can return NULL without
  signaling NULL result.
sql/item_cmpfunc.cc:
  Remove assignment to maybe_null, as it was already set in fix_fields()
  based on all arguments, not only on the first.

support-files/mysql.spec.sh:
  Switch from "make test*" to explicit calls of the test suite, so that "report features" can be used.

into  mysql.com:/home/bk/MERGE/mysql-4.1-merge

mending windows test.


mysql-test/r/rpl_packet.result:
  results changed
mysql-test/t/rpl_packet.test:
  removing because of the connection with windows client can be lost instead of
  the error code back (source: manual).

mysql-test/Makefile.am:
  add include/*.test to dist-hook and install-data-local targets to include the three .test files in mysql-test/include with make dist

into  rakia.gmz:/home/kgeorge/mysql/autopush/B19216-4.1-opt

into  mysql.com:/home/bk/MERGE/mysql-4.1-merge

 The server sends a number of columns to the client.
 It uses a limited "fast" function for that instead of the
 general one. This fast function cannot send numbers larger 
 than 2 bytes. 
 This causes the client to expect smaller number of columns. 
 The client writes outside of the allocated memory buffer 
 as a result.
 Fixed the server to use the general function to send column
 count.
 Fixed the client to check the column count before writing
 column data. 


mysql-test/t/mysql_client.test:
  Bug #19216: Client crashes on long SELECT
   - test case
sql/protocol.cc:
  Bug #19216: Client crashes on long SELECT
   - renamed the function for bether comprehention
     and made it local
   - used the right (non-local) function to transfer 
     the column count in Protocol::send_fields
sql/protocol.h:
  Bug #19216: Client crashes on long SELECT
   - made optimized net_store_length local
sql-common/client.c:
  Bug #19216: Client crashes on long SELECT
   - fixed the client to check for older servers (without the fix).

comments are fixed as was suggested in reviews.


sql/log_event.h:
  fixing comments
sql/slave.cc:
  fixing comments
sql/sql_repl.cc:
  fixing comments