Return exit(1) instead of exit(0) on failure.
  Allow longer path names using MAXPATHLEN.
  Added option --testcase that skips some failing tests.
  Replaced 'return' with exit(1) in test_frm_bug().
mysqltest.c:
  Let --exec fail if command fails


client/mysqltest.c:
  Let --exec fail if command fails
tests/client_test.c:
  Return exit(1) instead of exit(0) on failure.
  Allow longer path names using MAXPATHLEN.
  Added option --testcase that skips some failing tests.
  Replaced 'return' with exit(1) in test_frm_bug().

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

into mysql.com:/GORDON/MySQL/mysql-4.1/src

These modifications were part of WL#1856 Conversion of client_test.c tests cases to mysqltest if possible

They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.  

Make the result sets (order of rows) more predictable by using ORDER BY.


mysql-test/include/ps_modify.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/include/ps_modify1.inc:
  Make the result sets more predictable by using ORDER BY
mysql-test/r/ps_2myisam.result:
  updated results
mysql-test/r/ps_3innodb.result:
  updated results
mysql-test/r/ps_4heap.result:
  updated results
mysql-test/r/ps_5merge.result:
  updated results
mysql-test/r/ps_6bdb.result:
  updated results
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

Merge fixes


mysql-test/r/ndb_insert.result:
  Correct test cases and result after merge
mysql-test/t/ndb_insert.test:
  Correct test cases and result after merge
sql/ha_ndbcluster.cc:
  Correct get_error_message after merge
  Use buf pointer in get_ndb_value

uninit variable


ndb/src/kernel/vm/Configuration.cpp:
  init variable

into mysql.com:/home/jonas/src/mysql-4.1

sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
mysql-test/r/ndb_insert.result:
  Merge new test cases
mysql-test/t/ndb_insert.test:
  Merge new test cases

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

key Column Fails".


mysql-test/r/ps.result:
  Test results updated: a test case for Bug#5510 "inserting Null in 
  AutoIncrement primary key Column Fails".
mysql-test/r/ps_2myisam.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_3innodb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_4heap.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_5merge.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_6bdb.result:
  Bug#5510: a different warning in case of NULL->default truncation.This is 
  OK, the new warning is the same as produced by conventional execution.
mysql-test/t/ps.test:
  A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails".
sql/item.cc:
  A fix for bug#5510 "inserting Null in AutoIncrement primary key Column 
  Fails": use proper Field API function for NULL placholeders.

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

with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.


mysql-test/t/ps.test:
  A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
  with a fixed constant to pass on QNX:
  max_data_file_length is calculated depending on max value of record
  pointer. It's different on QNX, so the result difference is intentional.

into hundin.mysql.fi:/home/marko/j/mysql-4.1


sql/ha_innodb.cc:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/mysqld.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-update-4.1


sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged

into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

acinclude.m4:
  Uncommented zlib library message checking for Netware.
netware/init_db.sql:
  Applied a patch for Netware.
netware/test_db.sql:
  Applied a patch for Netware.

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

into gw.mysql.r18.ru:/usr/home/ram/work/4.1

mysql-test/r/func_compress.result:
  clean-up. The length of compress() may depend on zlib version, etc.
mysql-test/t/func_compress.test:
  clean-up. The length of compress() may depend on zlib version, etc.

of EXPLAIN SELECT, rather than binary strings.

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

into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge

set a printout in SocketClient only for debug


ndb/src/common/util/SocketClient.cpp:
  set a printout only for debug
scripts/mysql_install_db.sh:
  mysql_install_db should do skip-ndbcluster

ndb/src/ndbapi/Ndblist.cpp:
  Add theNoOfDBnodes to DBUG_PRINT

ndb/src/ndbapi/Ndblist.cpp:
  Added DBUG_PRINT's etc to checkFailedNode

  Slightly improved the fix for bug #5406.


sql/opt_sum.cc:
  Slightly improved the fix for bug #5406.

  Bug #5561 No BINARY_FLAG in metadata


sql/item.cc:
  Bug #5561 No BINARY_FLAG in metadata

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


ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged

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

into eagle.mysql.r18.ru:/home/vva/work/mysql.orig/test/mysql-4.1

(for octane2)

included term.h if there isn't termcap.h in cmd-line-utils/libedit/term.c


cmd-line-utils/libedit/term.c:
  fixed Bug #5589 "libedit compile failure in term.c"
  
  (for octane2)
  
  included term.h if there isn't termcap.h

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

ndb/src/mgmsrv/main.cpp:
  Print error if read of local config file fails.