Viewing all changes in revision 916.1.23.
- Committer: Padraig O'Sullivan
- Date: 2009-03-20 15:39:49 UTC
- mfrom: (950 drizzle)
- mto: (960.2.4 mordred) (968.2.5 mordred)
- mto: This revision was merged to the branch mainline in revision 961.
- Revision ID: osullivan.padraig@gmail.com-20090320153949-1g1qvt5lndrjjbrv
Merge from trunk.
- files added:
- drizzled/diagnostics_area.cc
- tests/suite/big
- tests/suite/big/r
- tests/suite/big/t
- files removed:
- storage/innobase/mysql-test/patches/bug35261.diff
- files renamed:
- tests/r/archive-big.result => tests/suite/big/r/archive-big.result
- tests/r/concurrent_innodb.result => tests/suite/big/r/concurrent_innodb.result
- tests/r/read_many_rows_innodb.result => tests/suite/big/r/read_many_rows_innodb.result
- tests/r/sum_distinct-big.result => tests/suite/big/r/sum_distinct-big.result
- tests/r/variables-big.result => tests/suite/big/r/variables-big.result
- tests/t/archive-big.test => tests/suite/big/t/archive-big.test
- tests/t/concurrent_innodb.test => tests/suite/big/t/concurrent_innodb.test
- tests/t/read_many_rows_innodb.test => tests/suite/big/t/read_many_rows_innodb.test
- tests/t/sum_distinct-big.test => tests/suite/big/t/sum_distinct-big.test
- tests/t/variables-big.test => tests/suite/big/t/variables-big.test
- files modified:
- Makefile.am
expand all
collapse all
added
removed
