The DBUG code emits the current value of the proc_info member of THD,
which may be set to NULL.  It was wrong to dereference that value
with the format string %s without verifying that it was valid.

Now, insert an inline test that substitutes the string "(null)" for
NULL pointers.


sql/sql_class.cc:
  Dereferencing a NULL is illegal (though not fatal for %s on some 
  platforms), and we have no assurance that the caller didn't call us 
  with a valid string.

into  hh-nb.hungers:/work/merge/mysql-5.1-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

into  pilot.mysql.com:/data/msvensson/mysql/bug25988/my51-bug25988


vio/viossl.c:
  Auto merged

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


storage/ndb/tools/waiter.cpp:
  Manual merge from 5.0

ndb/tools/waiter.cpp:
  - Only contact ndb_mgmd once per loop
  - Program only cares about ndbd nodes -> remove the api and mgm vectors
  - Program can not wait for "starting" -> remove that code
  - Remove unused includes
  - Protect against SIGPIPE(writing to a socket where the mgmsrv was
    gone, silently killed the program)
  - Don't sleep one second if if all nodes are in the wanted state  
  - Use 100 milliseconds sleep between each poll

into  hh-nb.hungers:/work/merge/mysql-5.1-bug34190

into  trift2.:/MySQL/M51/push-5.1


configure.in:
  5.0 version changes don't propagate to 5.1, "use local".

into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build


sql/ha_ndbcluster_binlog.cc:
  Auto merged

sql/ha_ndbcluster_binlog.cc:
  Change 'assert' to 'DBUG_ASSERT' to avoid that the assert is triggered in the optimized version
  on solaris 10 for x86

BitKeeper/etc/ignore:
  Added mysql-test/suite/funcs_1.tar.zip to the ignore list

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).


mysql-test/mysql-test-run.pl:
  Fix bad merge (remove duplicate code adding --user=root arg)

mysql-test/mysql-test-run.pl:
  Fix typo (missing $prefix arg to mtr_add_arg(--user=root))

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  solace.(none):/home/mtaylor/src/mysql-5.1-build


BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

into  ramayana.hindu.god:/home/tsmith/m/bk/build/51


scripts/make_binary_distribution.sh:
  Auto merged

into  ramayana.hindu.god:/home/tsmith/m/bk/build/50

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build

into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build

cause sporadic, but benign, errors.


mysql-test/lib/mtr_report.pl:
  Filtering out sporadic but benign error in rpl_err_ignoredtable.

into  pilot.mysql.com:/data/msvensson/mysql/bug31239/my51-bug31239


storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Auto merged

ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
  Move the increment to next line to avoid icc optimization problem that
  caused the "b" reference to be incremented

mysql-test/lib/mtr_report.pl:
  Ignoring benign error message (killing query causes unpredictable
  error messages).
mysql-test/suite/binlog/t/binlog_old_versions.test:
  Disabling test case for embedded server.
sql/rpl_rli.cc:
  Inititializing uninitialized variable causing valgrind warning.

mysql-test/suite/rpl/r/rpl_user.result:
  Result change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/r/rpl_user.result:
  Manual merge.

mysql-test/r/rpl_user.result:
  Result change.

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl-merge


mysql-test/suite/rpl/t/rpl_user.test:
  Manual merging.

mysql-test/t/rpl_user.test:
  Removing redundant reset master and deleting users from master
  and slave without using binary log.