Viewing all changes in revision 3129.
- Committer: He Zhenxing
- Date: 2010-03-05 02:35:49 UTC
- mfrom: (3103.1.257 mysql-5.1)
- Revision ID: zhenxing.he@sun.com-20100305023549-gqwbkdymn2datox2
Auto merge from 5.1 main
- files removed:
- mysys/mf_strip.c
- storage/innodb_plugin/win-plugin
- files renamed:
- mysql-test/r/bug40113.result => mysql-test/r/innodb_lock_wait_timeout_1.result
- mysql-test/suite/binlog/r/binlog_tbl_metadata.result => mysql-test/suite/rpl/r/rpl_row_tbl_metadata.result
- mysql-test/suite/binlog/t/binlog_tbl_metadata.test => mysql-test/suite/rpl/t/rpl_row_tbl_metadata.test
- mysql-test/t/bug40113-master.opt => mysql-test/t/innodb_lock_wait_timeout_1-master.opt
- mysql-test/t/bug40113.test => mysql-test/t/innodb_lock_wait_timeout_1.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
