Merge bodhi.local:/opt/local/work/mysql-5.0-4968-pull-from-4.1

into  bodhi.local:/opt/local/work/mysql-5.1-4968-null-merge


mysql-test/r/ps.result:
  Use local.
mysql-test/r/sp.result:
  Use local
mysql-test/t/ps.test:
  Use local
mysql-test/t/sp.test:
  Use local
sql/mysql_priv.h:
  Use local
sql/sql_class.h:
  Use local
sql/sql_insert.cc:
  Use local
sql/sql_lex.cc:
  Use local
sql/sql_lex.h:
  Use local
sql/sql_list.h:
  Use local
sql/sql_parse.cc:
  Use local
sql/sql_show.cc:
  Use local
sql/sql_table.cc:
  Use local
sql/sql_yacc.yy:
  Use local