Viewing all changes in revision 1856.2.6.
- Committer: Joseph Daly
- Date: 2010-10-22 00:51:02 UTC
- mfrom: (1864 merge)
- mto: (1856.2.16 transaction_id_innodb)
- mto: This revision was merged to the branch mainline in revision 1900.
- Revision ID: skinny.moey@gmail.com-20101022005102-guisziqbmrqracjv
merge trunk
- files added:
- config/drizzle.ver
- files removed:
- mysql-test
- plugin/haildb/test-suite-dir
- plugin/haildb/test-suite-dir/haildb
- files renamed:
- plugin/haildb/test-suite-dir/haildb/tests/ => plugin/haildb/tests/
- mysql-test/innodb_bug46676.result => plugin/innobase/mysql-test/innodb_bug46676.result
- mysql-test/innodb_bug46676.test => plugin/innobase/mysql-test/innodb_bug46676.test
- files modified:
- Makefile.am
expand all
collapse all
added
removed
