Viewing all changes in revision 1750.4.3.
- Committer: patrick crews
- Date: 2010-09-16 14:38:00 UTC
- mfrom: (1768 staging)
- mto: (1771.1.1 pcrews)
- mto: This revision was merged to the branch mainline in revision 1772.
- Revision ID: gleebix@gmail.com-20100916143800-hyu1tcfnjcowfnpb
Merge with trunk
- files added:
- docs/_static
- docs/_templates
- plugin/function_dictionary
- plugin/function_dictionary/tests
- plugin/function_dictionary/tests/r
- plugin/function_dictionary/tests/t
- plugin/math_functions
- plugin/memory/tests
- plugin/memory/tests/r
- plugin/memory/tests/t
- plugin/string_functions
- plugin/utility_dictionary
- plugin/utility_dictionary/tests
- plugin/utility_dictionary/tests/r
- plugin/utility_dictionary/tests/t
- tests/suite/tamil
- tests/suite/tamil/r
- tests/suite/tamil/t
- files removed:
- extra/my_print_defaults.cc
- files renamed:
- drizzled/uniques.cc => drizzled/unique.cc
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_use_sys_malloc_off.result => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/r/config_use_internal_malloc.result
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_internal_malloc-master.opt
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off.test => plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_internal_malloc.test
- tests/r/deadlock_innodb.result => plugin/innobase/tests/r/deadlock_innodb.result
- tests/r/func_group_innodb.result => plugin/innobase/tests/r/func_group_innodb.result
- tests/r/group_min_max_innodb.result => plugin/innobase/tests/r/group_min_max_innodb.result
- tests/r/index_merge_innodb.result => plugin/innobase/tests/r/index_merge_innodb.result
- tests/r/innodb-semi-consistent.result => plugin/innobase/tests/r/innodb-semi-consistent.result
- tests/r/innodb.result => plugin/innobase/tests/r/innodb.result
- tests/r/innodb_mysql.result => plugin/innobase/tests/r/innodb_mysql.result
- tests/r/innodb_notembedded.result => plugin/innobase/tests/r/innodb_notembedded.result
- tests/r/innodb_trx_weight.result => plugin/innobase/tests/r/innodb_trx_weight.result
- tests/r/join_outer_innodb.result => plugin/innobase/tests/r/join_outer_innodb.result
- tests/r/loaddata_autocom_innodb.result => plugin/innobase/tests/r/loaddata_autocom_innodb.result
- tests/r/parser_bug21114_innodb.result => plugin/innobase/tests/r/parser_bug21114_innodb.result
- tests/r/rowid_order_innodb.result => plugin/innobase/tests/r/rowid_order_innodb.result
- tests/r/subselect_innodb.result => plugin/innobase/tests/r/subselect_innodb.result
- tests/r/unsafe_binlog_innodb.result => plugin/innobase/tests/r/unsafe_binlog_innodb.result
- tests/t/deadlock_innodb.test => plugin/innobase/tests/t/deadlock_innodb.test
- tests/t/func_group_innodb.test => plugin/innobase/tests/t/func_group_innodb.test
- tests/t/group_min_max_innodb.test => plugin/innobase/tests/t/group_min_max_innodb.test
- tests/t/index_merge_innodb.test => plugin/innobase/tests/t/index_merge_innodb.test
- tests/t/innodb-semi-consistent.test => plugin/innobase/tests/t/innodb-semi-consistent.test
- tests/t/innodb.test => plugin/innobase/tests/t/innodb.test
- tests/t/innodb_mysql.test => plugin/innobase/tests/t/innodb_mysql.test
- tests/t/innodb_notembedded.test => plugin/innobase/tests/t/innodb_notembedded.test
- tests/t/innodb_trx_weight.test => plugin/innobase/tests/t/innodb_trx_weight.test
- tests/t/join_outer_innodb.test => plugin/innobase/tests/t/join_outer_innodb.test
- tests/t/loaddata_autocom_innodb.test => plugin/innobase/tests/t/loaddata_autocom_innodb.test
- tests/t/parser_bug21114_innodb.test => plugin/innobase/tests/t/parser_bug21114_innodb.test
- tests/t/rowid_order_innodb.test => plugin/innobase/tests/t/rowid_order_innodb.test
- tests/t/subselect_innodb.test => plugin/innobase/tests/t/subselect_innodb.test
- tests/t/unsafe_binlog_innodb-master.opt => plugin/innobase/tests/t/unsafe_binlog_innodb-master.opt
- tests/t/unsafe_binlog_innodb.test => plugin/innobase/tests/t/unsafe_binlog_innodb.test
- plugin/heap/ => plugin/memory/
- tests/r/heap.result => plugin/memory/tests/r/heap.result
- tests/r/heap_auto_increment.result => plugin/memory/tests/r/heap_auto_increment.result
- tests/r/heap_btree.result => plugin/memory/tests/r/heap_btree.result
- tests/r/heap_hash.result => plugin/memory/tests/r/heap_hash.result
- tests/r/heap_var.result => plugin/memory/tests/r/heap_var.result
- tests/t/heap.test => plugin/memory/tests/t/heap.test
- tests/t/heap_auto_increment.test => plugin/memory/tests/t/heap_auto_increment.test
- tests/t/heap_btree.test => plugin/memory/tests/t/heap_btree.test
- tests/t/heap_hash.test => plugin/memory/tests/t/heap_hash.test
- tests/t/heap_var.test => plugin/memory/tests/t/heap_var.test
- tests/r/index_merge_myisam.result => plugin/myisam/tests/r/index_merge_myisam.result
- tests/r/mix2_myisam.result => plugin/myisam/tests/r/mix2_myisam.result
- tests/r/myisam-blob.result => plugin/myisam/tests/r/myisam-blob.result
- tests/t/index_merge_myisam.test => plugin/myisam/tests/t/index_merge_myisam.test
- tests/t/mix2_myisam.test => plugin/myisam/tests/t/mix2_myisam.test
- tests/t/myisam-blob-master.opt => plugin/myisam/tests/t/myisam-blob-master.opt
- tests/t/myisam-blob.test => plugin/myisam/tests/t/myisam-blob.test
- files modified:
- Makefile.am
- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt
expand all
collapse all
added
removed
