Merge mysql.com:/home/mydev/mysql-4.0-bug5390

into  mysql.com:/home/mydev/mysql-4.1-bug5390


mysql-test/r/create.result:
  Auto merged
mysql-test/r/merge.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
sql/lock.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
mysql-test/t/merge.test:
  BUG#5390 - problems with merge tables
  Manual merge.
sql/sql_parse.cc:
  BUG#5390 - problems with merge tables
  Manual merge.