Viewing all changes in revision 1796.4.19.
- Committer: Andrew Hutchings
- Date: 2010-11-01 22:04:06 UTC
- mfrom: (1897 merge)
- mto: This revision was merged to the branch mainline in revision 1907.
- Revision ID: andrew@linuxjedi.co.uk-20101101220406-nj6i29uzja17u1hn
Merge trunk into branch
- files added:
- config/drizzle.ver
- drizzled/definition
- plugin/filtered_replicator/tests
- plugin/filtered_replicator/tests/r
- plugin/filtered_replicator/tests/t
- plugin/mysql_unix_socket_protocol
- plugin/storage_engine_api_tester
- plugin/storage_engine_api_tester/tests
- plugin/storage_engine_api_tester/tests/r
- plugin/storage_engine_api_tester/tests/t
- plugin/utility_functions
- plugin/utility_functions/tests
- plugin/utility_functions/tests/r
- plugin/utility_functions/tests/t
- files removed:
- plugin/database_function
- plugin/haildb/test-suite-dir
- plugin/haildb/test-suite-dir/haildb
- plugin/user_function
- files renamed:
- drizzled/table_share.cc => drizzled/definition/table.cc
- drizzled/table_share.h => drizzled/definition/table.h
- drizzled/set_var.cc => drizzled/sys_var.cc
- drizzled/set_var.h => drizzled/sys_var.h
- plugin/archive/tests/r/archive_aio_posix.result => plugin/archive/tests/r/aio_posix.result
- plugin/archive/tests/r/archive_basic.result => plugin/archive/tests/r/basic.result
- plugin/archive/tests/r/archive_discover.result => plugin/archive/tests/r/discover.result
- plugin/archive/tests/r/archive.result => plugin/archive/tests/r/engine.result
- plugin/archive/tests/t/archive_aio_posix.test => plugin/archive/tests/t/aio_posix.test
- plugin/archive/tests/t/archive_basic.test => plugin/archive/tests/t/basic.test
- plugin/archive/tests/t/archive_discover.test => plugin/archive/tests/t/discover.test
- plugin/archive/tests/t/archive.test => plugin/archive/tests/t/engine.test
- plugin/blitzdb/tests/r/blitzdb-alter.result => plugin/blitzdb/tests/r/alter.result
- plugin/blitzdb/tests/r/blitzdb-basic.result => plugin/blitzdb/tests/r/basic.result
- plugin/blitzdb/tests/r/blitzdb-decimal.result => plugin/blitzdb/tests/r/decimal.result
- plugin/blitzdb/tests/r/blitzdb-index.result => plugin/blitzdb/tests/r/index.result
- plugin/blitzdb/tests/r/blitzdb-indexes.result => plugin/blitzdb/tests/r/indexes.result
- plugin/blitzdb/tests/r/blitzdb-join.result => plugin/blitzdb/tests/r/join.result
- plugin/blitzdb/tests/r/blitzdb-range.result => plugin/blitzdb/tests/r/range.result
- plugin/blitzdb/tests/t/blitzdb-alter.test => plugin/blitzdb/tests/t/alter.test
- plugin/blitzdb/tests/t/blitzdb-basic.test => plugin/blitzdb/tests/t/basic.test
- plugin/blitzdb/tests/t/blitzdb-decimal.test => plugin/blitzdb/tests/t/decimal.test
- plugin/blitzdb/tests/t/blitzdb-index.test => plugin/blitzdb/tests/t/index.test
- plugin/blitzdb/tests/t/blitzdb-indexes.test => plugin/blitzdb/tests/t/indexes.test
- plugin/blitzdb/tests/t/blitzdb-join.test => plugin/blitzdb/tests/t/join.test
- plugin/blitzdb/tests/t/blitzdb-range.test => plugin/blitzdb/tests/t/range.test
- plugin/csv/tests/r/csv_alter_table.result => plugin/csv/tests/r/alter_table.result
- plugin/csv/tests/r/csv.result => plugin/csv/tests/r/basic.result
- plugin/csv/tests/r/csv_not_null.result => plugin/csv/tests/r/not_null.result
- plugin/csv/tests/t/csv_alter_table.test => plugin/csv/tests/t/alter_table.test
- plugin/csv/tests/t/csv.test => plugin/csv/tests/t/basic.test
- plugin/csv/tests/t/csv_not_null.test => plugin/csv/tests/t/not_null.test
- plugin/transaction_log/tests/r/filtered_replicator.result => plugin/filtered_replicator/tests/r/filtered_replicator.result
- plugin/transaction_log/tests/t/filtered_replicator-master.opt => plugin/filtered_replicator/tests/t/filtered_replicator-master.opt
- plugin/transaction_log/tests/t/filtered_replicator.test => plugin/filtered_replicator/tests/t/filtered_replicator.test
- plugin/haildb/test-suite-dir/haildb/tests/ => plugin/haildb/tests/
- plugin/memory/tests/r/heap.result => plugin/memory/tests/r/basic.result
- plugin/memory/tests/t/heap.test => plugin/memory/tests/t/basic.test
- plugin/myisam/tests/r/myisam.result => plugin/myisam/tests/r/basic.result
- plugin/myisam/tests/r/myisam-blob.result => plugin/myisam/tests/r/blob.result
- plugin/myisam/tests/r/myisam_rollback.result => plugin/myisam/tests/r/rollback.result
- plugin/myisam/tests/t/myisam.test => plugin/myisam/tests/t/basic.test
- plugin/myisam/tests/t/myisam-blob-master.opt => plugin/myisam/tests/t/blob-master.opt
- plugin/myisam/tests/t/myisam-blob.test => plugin/myisam/tests/t/blob.test
- plugin/myisam/tests/t/myisam_rollback.test => plugin/myisam/tests/t/rollback.test
- plugin/rot13/tests/r/rot13_basic.result => plugin/rot13/tests/r/basic.result
- plugin/rot13/tests/t/rot13_basic.test => plugin/rot13/tests/t/basic.test
- plugin/database_function/database_function.cc => plugin/utility_functions/schema.cc
- plugin/user_function/user_function.cc => plugin/utility_functions/user.cc
- tests/suite/jp/r/jp_alter_utf8.result => tests/suite/jp/r/alter_utf8.result
- tests/suite/jp/r/jp_charlength_utf8.result => tests/suite/jp/r/charlength_utf8.result
- tests/suite/jp/r/jp_create_db_utf8.result => tests/suite/jp/r/create_db_utf8.result
- tests/suite/jp/r/jp_create_tbl_utf8.result => tests/suite/jp/r/create_tbl_utf8.result
- tests/suite/jp/r/jp_enum_utf8.result => tests/suite/jp/r/enum_utf8.result
- tests/suite/jp/r/jp_insert_utf8.result => tests/suite/jp/r/insert_utf8.result
- tests/suite/jp/r/jp_instr_utf8.result => tests/suite/jp/r/instr_utf8.result
- tests/suite/jp/r/jp_join_utf8.result => tests/suite/jp/r/join_utf8.result
- tests/suite/jp/r/jp_left_utf8.result => tests/suite/jp/r/left_utf8.result
- tests/suite/jp/r/jp_length_utf8.result => tests/suite/jp/r/length_utf8.result
- tests/suite/jp/r/jp_like_utf8.result => tests/suite/jp/r/like_utf8.result
- tests/suite/jp/r/jp_locate_utf8.result => tests/suite/jp/r/locate_utf8.result
- tests/suite/jp/r/jp_lpad_utf8.result => tests/suite/jp/r/lpad_utf8.result
- tests/suite/jp/r/jp_ltrim_utf8.result => tests/suite/jp/r/ltrim_utf8.result
- tests/suite/jp/r/jp_replace_utf8.result => tests/suite/jp/r/replace_utf8.result
- tests/suite/jp/r/jp_reverse_utf8.result => tests/suite/jp/r/reverse_utf8.result
- tests/suite/jp/r/jp_right_utf8.result => tests/suite/jp/r/right_utf8.result
- tests/suite/jp/r/jp_rpad_utf8.result => tests/suite/jp/r/rpad_utf8.result
- tests/suite/jp/r/jp_rtrim_utf8.result => tests/suite/jp/r/rtrim_utf8.result
- tests/suite/jp/r/jp_select_utf8.result => tests/suite/jp/r/select_utf8.result
- tests/suite/jp/r/jp_subquery_utf8.result => tests/suite/jp/r/subquery_utf8.result
- tests/suite/jp/r/jp_substring_utf8.result => tests/suite/jp/r/substring_utf8.result
- tests/suite/jp/r/jp_trim_utf8.result => tests/suite/jp/r/trim_utf8.result
- tests/suite/jp/r/jp_update_utf8.result => tests/suite/jp/r/update_utf8.result
- tests/suite/jp/r/jp_where_utf8.result => tests/suite/jp/r/where_utf8.result
- tests/suite/jp/t/jp_alter_utf8.test => tests/suite/jp/t/alter_utf8.test
- tests/suite/jp/t/jp_charlength_utf8.test => tests/suite/jp/t/charlength_utf8.test
- tests/suite/jp/t/jp_create_db_utf8.test => tests/suite/jp/t/create_db_utf8.test
- tests/suite/jp/t/jp_create_tbl_utf8.test => tests/suite/jp/t/create_tbl_utf8.test
- tests/suite/jp/t/jp_enum_utf8.test => tests/suite/jp/t/enum_utf8.test
- tests/suite/jp/t/jp_insert_utf8.test => tests/suite/jp/t/insert_utf8.test
- tests/suite/jp/t/jp_instr_utf8.test => tests/suite/jp/t/instr_utf8.test
- tests/suite/jp/t/jp_join_utf8.test => tests/suite/jp/t/join_utf8.test
- tests/suite/jp/t/jp_left_utf8.test => tests/suite/jp/t/left_utf8.test
- tests/suite/jp/t/jp_length_utf8.test => tests/suite/jp/t/length_utf8.test
- tests/suite/jp/t/jp_like_utf8.test => tests/suite/jp/t/like_utf8.test
- tests/suite/jp/t/jp_locate_utf8.test => tests/suite/jp/t/locate_utf8.test
- tests/suite/jp/t/jp_lpad_utf8.test => tests/suite/jp/t/lpad_utf8.test
- tests/suite/jp/t/jp_ltrim_utf8.test => tests/suite/jp/t/ltrim_utf8.test
- tests/suite/jp/t/jp_replace_utf8.test => tests/suite/jp/t/replace_utf8.test
- tests/suite/jp/t/jp_reverse_utf8.test => tests/suite/jp/t/reverse_utf8.test
- tests/suite/jp/t/jp_right_utf8.test => tests/suite/jp/t/right_utf8.test
- tests/suite/jp/t/jp_rpad_utf8.test => tests/suite/jp/t/rpad_utf8.test
- tests/suite/jp/t/jp_rtrim_utf8.test => tests/suite/jp/t/rtrim_utf8.test
- tests/suite/jp/t/jp_select_utf8.test => tests/suite/jp/t/select_utf8.test
- tests/suite/jp/t/jp_subquery_utf8.test => tests/suite/jp/t/subquery_utf8.test
- tests/suite/jp/t/jp_substring_utf8.test => tests/suite/jp/t/substring_utf8.test
- tests/suite/jp/t/jp_trim_utf8.test => tests/suite/jp/t/trim_utf8.test
- tests/suite/jp/t/jp_update_utf8.test => tests/suite/jp/t/update_utf8.test
- tests/suite/jp/t/jp_where_utf8.test => tests/suite/jp/t/where_utf8.test
- tests/suite/tamil/r/tamil_utf8_create_database.result => tests/suite/tamil/r/utf8_create_database.result
- tests/suite/tamil/r/tamil_utf8_create_table.result => tests/suite/tamil/r/utf8_create_table.result
- tests/suite/tamil/t/tamil_utf8_create_database.test => tests/suite/tamil/t/utf8_create_database.test
- tests/suite/tamil/t/tamil_utf8_create_table.test => tests/suite/tamil/t/utf8_create_table.test
- files modified:
- .bzrignore
expand all
collapse all
added
removed
