Viewing all changes in revision 1206.
- Committer: Jay Pipes
- Date: 2009-12-14 20:25:43 UTC
- mfrom: (1143.14.75 staging)
- Revision ID: jpipes@serialcoder-20091214202543-mpslf60zs4d9mo5v
Merge trunk
- files added:
- drizzled/optimizer/quick_index_merge_select.cc
- plugin/show_schema_proto
- plugin/show_schema_proto/tests
- plugin/show_schema_proto/tests/r
- plugin/show_schema_proto/tests/t
- files removed:
- support-files/drizzle.m4
- tests/extra
- tests/extra/binlog_tests
- tests/extra/rpl_tests
- tests/misc
- tests/std_data/parts
- files renamed:
- drizzled/hash/Makefile.am => drizzled/hash/include.am
- drizzled/Makefile.am => drizzled/include.am
- drizzled/message/Makefile.am => drizzled/message/include.am
- drizzled/util/Makefile.am => drizzled/util/include.am
- support-files/Makefile.am => support-files/include.am
- tests/Makefile.am => tests/include.am
- files modified:
- .bzrignore
expand all
collapse all
added
removed
