Merge trift2.:/MySQL/M51/clone-5.1

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

This is mysql-5.1.22-rc.


mysql-test/r/innodb_mysql.result:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_select.cc:
  Manual merge - the 31001 bug is already fixed.
mysql-test/include/mix1.inc:
  Manual merge - should not have conflicted at all.

scripts/mysql_install_db.sh

@@ -231,6 +231,7 @@ then
   pkgdatadir="@pkgdatadir@"
 else
   bindir="$basedir/bin"
+  extra_bindir="$bindir"
   # We set up bootstrap-specific paths later, so skip this for --windows
   if test "$windows" -eq 0
   then