Merge chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.1-axmrg


client/mysql.cc:
  Auto merged
include/my_global.h:
  Auto merged
include/thr_alarm.h:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/myisam.result:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/myisam.test:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
mysys/default.c:
  Auto merged
mysys/my_pthread.c:
  Auto merged
mysys/my_thr_init.c:
  Auto merged
mysys/thr_alarm.c:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/gen_lex_hash.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
vio/viosslfactories.c:
  Auto merged
BitKeeper/deleted/.del-mysqld.cc.rej:
  Delete: sql/mysqld.cc.rej
BitKeeper/deleted/.del-my_create_tables.c~c121a0c4c427ebb:
  Auto merged
BitKeeper/deleted/.del-my_manage.c~4de50e721d227d19:
  Auto merged
BitKeeper/deleted/.del-my_manage.h~9d2cbc1e8bc894f:
  Auto merged
BitKeeper/deleted/.del-mysql.dsw~7ea9e16395f139f4:
  Null merged
BitKeeper/deleted/.del-mysql.sln~76a9ff1e793b3547:
  Null merged
BitKeeper/deleted/.del-mysql_test_run_new.c~a23ab2c4b28b25ad:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.dsp~9d8078f3f02fcc8e:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new.vcproj~1ddaed30361efefe:
  Auto merged
BitKeeper/deleted/.del-mysql_test_run_new_ia64.dsp~e7ee71ec8d2995e3:
  Auto merged
BUILD/SETUP.sh:
  Manual merged
Makefile.am:
  Manual merged
configure.in:
  Manual merged
include/my_pthread.h:
  Manual merged
mysql-test/Makefile.am:
  Manual merged
sql/mysqld.cc:
  Manual merged
support-files/mysql.spec.sh:
  Manual merged