mysys/my_init.c:
  Changed implementation slightly to use a local variable for keeping track of wheter we should print to the info_file even if the flag is not set in infoflag
  Explicitly turn off print_info if there is no DBUG_FILE

 - Enable testcases after help from Serg 


client/mysqltest.c:
  Dump output to stdout if no result file is specified
  Don't print verbose_msg when command fails whith expected error
mysql-test/mysql-test-run.pl:
  Don't add all args to the MYSQL_TEST environment variable.
mysql-test/r/mysqltest.result:
  Add test for mysqltest -x
mysql-test/t/mysqltest.test:
  Add test for mysqltest -x

client/mysqltest.c:
  Don't print "At line: 0"

client/mysqltest.c:
  Only print line no if start_lineno > 0
  Remove lineno in calls to verbose_msg and die, this is handled by the function.

 - Improved solution


mysql-test/r/mysqltest.result:
  Update test results
mysql-test/t/mysqltest.test:
  Fix test for failing "exec" and "system", by using the false command

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

client/mysqltest.c:
  Backport from 5.0
mysql-test/t/mysqltest.test:
  Remove the extra ;

into mysql.com:/Users/eric/bktmp/mysql-4.1


sql/sql_parse.cc:
  Auto merged

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

  Argument of RAND function can be constant value only

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


sql/mysql_priv.h:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_cache.h:
  Auto merged
configure.in:
  merge
mysql-test/r/fulltext_var.result:
  merge
sql/mysqld.cc:
  merge
sql/set_var.cc:
  merge

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

sql/mysql_priv.h:
  initialisation moved to mysqld.cc
sql/mysqld.cc:
  initialisation moved to mysqld.cc
sql/sql_cache.cc:
  support of concurent query cache resizing:
        - resizing made atomic
        - check stack size after each quard mutex lock
sql/sql_cache.h:
  initialisation moved to mysqld.cc
  removed uneed parameter (now it is always under guard mutex protection or called from destruction)

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

 - Update test cases


mysql-test/t/mysqltest.test:
  Uncomment the mysqltest -x test. Can't get the output to end up in the result file.

mysql-test/r/mysqltest.result:
  Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms
mysql-test/t/mysqltest.test:
  Disable test for failing --exec and --system since output can't be piped to /dev/null on all platforms
  Avoid "echo -e" by using a temporary .sql file for tests that require more than one line.

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

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


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

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


client/mysqltest.c:
  Auto merged

  bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes


sql/mysql_priv.h:
  bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes
sql/mysqld.cc:
  bug#9948
  changed client-charset behavior in 4.1.x libmysql, which issue BC prob
  after review fixes

into dl145b.mysql.com:/home/ndbdev/mysql-4.1

client/mysqltest.c:
  Fixes for mysqltest -x  <filename>
mysql-test/t/mysqltest.test:
  Test mysqltest -x <filename>
mysql-test/include/mysqltest-x.inc:
  New BitKeeper file ``mysql-test/include/mysqltest-x.inc''

added parseable printout in ndb_restore

  Test case for bug #12859 group_concat in subquery cause incorrect not null.


mysql-test/r/func_gconcat.result:
  Test case for bug #12859 group_concat in subquery cause incorrect not null.
mysql-test/t/func_gconcat.test:
  Test case for bug #12859 group_concat in subquery cause incorrect not null.

into  mysql.com:/usr/home/ram/work/4.1.b4214


myisam/mi_check.c:
  Auto merged
myisam/myisampack.c:
  Auto merged

myisam/mi_check.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - pass version to the save_pack_length().
myisam/mi_packrec.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - code cleanup: read_pack_length() and calc_pack_length() introduced, 
                  save_pack_length() modified: now the behavior depends on packing version
  - save packing version in the share->pack.version
  - pass it to the read_pack_length()
myisam/mi_static.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - packing version set to 2
myisam/myisamdef.h:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - packing version slot introduced (see MI_PACK)
myisam/myisampack.c:
  a fix (bug #4214: Table corruption with myisampack and large BLOB objects).
  - code cleanup
  - pass version to the calc_pack_length() and save_pack_length()

mysql-test/t/openssl_1.test:
  Remove extra delimiter ;

+ added option to dumpe rest of page after exnd of data


ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp:
  fixed small bug in ndb redolog printer
ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp:
  fixed small bug in ndb redolog printer

into  eel.(none):/home/jonas/src/mysql-4.1-push

Handle systems like default FC4 where 127.0.0.1 doesn't always map to 'localhost' first. 
(Bug #11822)


sql/hostname.cc:
  Short-circuit ip_to_hostname() lookup for INADDR_LOOPBACK to allways return 'localhost'.
sql/sql_parse.cc:
  Push special handling of 127.0.0.1 into ip_to_hostname().

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

client/mysqltest.c:
  Have variable declarations before "DBUG_ENTER",
  the opposite order will fail to compile on some platforms.

into  eel.(none):/home/jonas/src/mysql-4.1-push

ndb/src/common/debugger/EventLogger.cpp:
  Fix extended printout of LCP_FRAGMENT_COMPLETED

  Always abort if node failure occured between startTransaction and commit
  (can later be improved by wl#2610)


ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Always abort if node failure occured between startTransaction and commit

  make sure not to cut log to early 
  (specificly not use LCP with maxGciStarted that has not yet completed)


ndb/include/kernel/signaldata/SignalData.hpp:
  Add signal data printer for START_FRAG_REQ
ndb/include/kernel/signaldata/StartFragReq.hpp:
  Add signal data printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/SignalDataPrint.cpp:
  Add signal data printer for START_FRAG_REQ
ndb/src/common/debugger/signaldata/StartRec.cpp:
  Add signal data printer for START_FRAG_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Add maxGciStarted/Completed to event report
  bug: dont use LCP for calcKeepGci in maxGciSTarted is not completed