Merge mysqldev@production.mysql.com:my/mysql-5.1-release

into  mysql.com:/home/bk/w3023-mysql-5.1-new

mysql-test/t/sp.test

@@ -2583,6 +2583,7 @@ begin
   show warnings;
 end|
 --disable_parsing
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events;
 show storage engines;
 show master status;