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

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

mysql-test/t/rpl_sp.test

@@ -341,6 +341,7 @@ drop trigger trg;
 insert into t1 values (1);
 select * from t1;
 --replace_column 2 # 5 #
+--replace_regex /table_id: [0-9]+/table_id: #/
 show binlog events in 'master-bin.000001' from 102;
 sync_slave_with_master;
 select * from t1;