« back to all changes in this revision
Viewing changes to plugin/embedded_innodb/tests/t/basic_transaction-master.opt
- Committer: Jay Pipes
- Date: 2010-04-08 16:27:25 UTC
- mfrom: (1405.6.10 replication-pairs)
- mto: This revision was merged to the branch mainline in revision 1457.
- Revision ID: jpipes@serialcoder-20100408162725-sugbgn38oxjqclq2
Merge trunk and replication-pairs with conflict resolution
- files added:
- drizzled/drizzle_time.cc
- plugin/auth_file
- plugin/auth_file/tests
- plugin/auth_file/tests/r
- plugin/auth_file/tests/t
- plugin/embedded_innodb
- plugin/embedded_innodb/tests
- plugin/embedded_innodb/tests/r
- plugin/embedded_innodb/tests/t
- plugin/rabbitmq/tests
- plugin/rabbitmq/tests/r
- plugin/rabbitmq/tests/t
- plugin/replication_dictionary
- plugin/replication_dictionary/tests
- plugin/replication_dictionary/tests/r
- plugin/replication_dictionary/tests/t
- files removed:
- drizzled/my_getopt.cc
- files renamed:
- plugin/logging_stats/score_board_slot.h => plugin/logging_stats/scoreboard_slot.h
- files modified:
- client/client_priv.h
added
removed
plugin/embedded_innodb/tests/t/basic_transaction-master.opt
