Viewing all changes in revision 1238.2.1.
- Committer: Monty Taylor
- Date: 2009-12-06 00:49:41 UTC
- mfrom: (1192.3.62 pandora-build)
- mto: (1192.3.69 pandora-build)
- mto: This revision was merged to the branch mainline in revision 1241.
- Revision ID: mordred@inaugust.com-20091206004941-s1co6tfunsl3ltif
Merged up.
- files added:
- config/lint-source.am
- plugin/mysql_protocol
- files removed:
- config/pandora-plugin.am
- tests/extra
- tests/extra/binlog_tests
- tests/extra/rpl_tests
- tests/misc
- tests/std_data/parts
- tests/suite/archive
- tests/suite/archive/r
- tests/suite/archive/t
- files renamed:
- config/register_plugins.py => config/pandora-plugin
- drizzled/hash/Makefile.am => drizzled/hash/include.am
- drizzled/Makefile.am => drizzled/include.am
- drizzled/message/Makefile.am => drizzled/message/include.am
- drizzled/opt_range.cc => drizzled/optimizer/range.cc
- drizzled/opt_range.h => drizzled/optimizer/range.h
- drizzled/opt_sum.cc => drizzled/optimizer/sum.cc
- m4/cxx_cinttypes.m4 => m4/pandora_cinttypes.m4
- m4/cxx_cstdint.m4 => m4/pandora_cstdint.m4
- m4/vl_lib_readline.m4 => m4/pandora_have_libreadline.m4
- m4/stl_hash.m4 => m4/pandora_stl_hash.m4
- plugin/oldlibdrizzle/ => plugin/drizzle_protocol/
- plugin/info_schema/info_schema_methods.cc => plugin/info_schema/helper_methods.cc
- plugin/info_schema/info_schema_methods.h => plugin/info_schema/helper_methods.h
- support-files/Makefile.am => support-files/include.am
- tests/Makefile.am => tests/include.am
- tests/suite/archive/r/archive.result => tests/r/archive.result
- tests/suite/archive/r/archive_aio_posix.result => tests/r/archive_aio_posix.result
- tests/suite/archive/r/archive_basic.result => tests/r/archive_basic.result
- tests/suite/archive/r/archive_discover.result => tests/r/archive_discover.result
- tests/suite/archive/t/archive.test => tests/t/archive.test
- tests/suite/archive/t/archive_aio_posix.test => tests/t/archive_aio_posix.test
- tests/suite/archive/t/archive_basic.test => tests/t/archive_basic.test
- tests/suite/archive/t/archive_discover.test => tests/t/archive_discover.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
