« back to all changes in this revision
Viewing changes to drizzled/set_var.cc
- Committer: Andrew Hutchings
- Date: 2010-09-08 19:03:09 UTC
- mfrom: (1750 staging)
- mto: (1750.1.1 build)
- mto: This revision was merged to the branch mainline in revision 1751.
- Revision ID: andrew@linuxjedi.co.uk-20100908190309-mya1nu7xvo1fpvk8
Merge trunk into branch
- files added:
- drizzled/message/resultset.proto
- plugin/memcached_query_cache
- plugin/memcached_query_cache/tests
- plugin/memcached_query_cache/tests/r
- plugin/memcached_query_cache/tests/t
- files modified:
- client/client_priv.h
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_innodb_truncate_table-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/basic_insert_pkey_duplicate-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt
added
removed
drizzled/set_var.cc
