Merge bodhi.local:/opt/local/work/mysql-4.1-4968-to-push

into  bodhi.local:/opt/local/work/mysql-5.0-4968-to-push


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_table.cc:
  Use local