« back to all changes in this revision
Viewing changes to plugin/session_dictionary/dictionary.h
- Committer: Brian Aker
- Date: 2010-05-04 18:18:37 UTC
- mfrom: (1518.1.1 valgrind-warning-md5)
- Revision ID: brian@gaz-20100504181837-q9m9yq9315wlrqiw
Merge Monty
- files added:
- ABOUT-NLS
- gnulib
- plugin/database_function
- plugin/errmsg_notify/tests
- plugin/errmsg_notify/tests/r
- plugin/errmsg_notify/tests/t
- plugin/innobase/mysql-test
- plugin/innobase/mysql-test/patches
- plugin/innobase/win-plugin
- plugin/logging_syslog
- plugin/pool_of_threads
- plugin/pool_of_threads/tests
- plugin/pool_of_threads/tests/r
- plugin/pool_of_threads/tests/t
- plugin/single_thread
- plugin/single_thread/tests
- plugin/single_thread/tests/r
- plugin/single_thread/tests/t
- plugin/user_function
- files removed:
- .quickly
- docs
- docs/_static
- docs/_templates
- docs/clients
- docs/libdrizzle
- docs/plugins
- docs/testing
- drizzled/definition
- drizzled/generator
- drizzled/identifier
- drizzled/locking
- drizzled/module
- drizzled/plugin/client
- drizzled/program_options
- drizzled/session
- drizzled/table
- examples
- libdrizzle
- plugin/auth_ldap/schema
- plugin/auth_ldap/schema/openldap
- plugin/blitzdb
- plugin/blitzdb/tests
- plugin/blitzdb/tests/r
- plugin/blitzdb/tests/t
- plugin/coercibility_function
- plugin/coercibility_function/tests
- plugin/coercibility_function/tests/r
- plugin/coercibility_function/tests/t
- plugin/debug
- plugin/debug/tests
- plugin/debug/tests/r
- plugin/debug/tests/t
- plugin/error_dictionary
- plugin/error_dictionary/tests
- plugin/error_dictionary/tests/r
- plugin/error_dictionary/tests/t
- plugin/filesystem_engine
- plugin/filesystem_engine/tests
- plugin/filesystem_engine/tests/r
- plugin/filesystem_engine/tests/t
- plugin/filtered_replicator/tests
- plugin/filtered_replicator/tests/r
- plugin/filtered_replicator/tests/t
- plugin/function_dictionary
- plugin/function_dictionary/tests
- plugin/function_dictionary/tests/r
- plugin/function_dictionary/tests/t
- plugin/haildb/docs
- plugin/hello_events
- plugin/hello_events/tests
- plugin/hello_events/tests/r
- plugin/hello_events/tests/t
- plugin/innobase/docs
- plugin/innobase/mysql-test
- plugin/math_functions
- plugin/memcached_query_cache
- plugin/memcached_query_cache/tests
- plugin/memcached_query_cache/tests/r
- plugin/memcached_query_cache/tests/t
- plugin/memory/tests
- plugin/memory/tests/r
- plugin/memory/tests/t
- plugin/myisam/tests
- plugin/myisam/tests/r
- plugin/myisam/tests/t
- plugin/mysql_unix_socket_protocol
- plugin/pbms
- plugin/pbms/src
- plugin/pbms/src/cslib
- plugin/pbms/tests
- plugin/pbms/tests/r
- plugin/pbms/tests/t
- plugin/pbxt/tests
- plugin/pbxt/tests/r
- plugin/pbxt/tests/t
- plugin/performance_dictionary
- plugin/performance_dictionary/tests
- plugin/performance_dictionary/tests/r
- plugin/performance_dictionary/tests/t
- plugin/rand_function
- plugin/rand_function/tests
- plugin/rand_function/tests/r
- plugin/rand_function/tests/t
- plugin/shutdown_function
- 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/string_functions
- plugin/string_functions/tests
- plugin/string_functions/tests/r
- plugin/string_functions/tests/t
- plugin/syslog
- plugin/transaction_log/docs
- plugin/transaction_log/utilities
- plugin/trigger_dictionary
- plugin/trigger_dictionary/tests
- plugin/trigger_dictionary/tests/r
- plugin/trigger_dictionary/tests/t
- plugin/user_locks
- plugin/user_locks/tests
- plugin/user_locks/tests/r
- plugin/user_locks/tests/t
- plugin/utility_dictionary
- plugin/utility_dictionary/tests
- plugin/utility_dictionary/tests/r
- plugin/utility_dictionary/tests/t
- plugin/utility_functions
- plugin/utility_functions/tests
- plugin/utility_functions/tests/r
- plugin/utility_functions/tests/t
- tests/suite/execute
- tests/suite/execute/r
- tests/suite/execute/t
- tests/suite/flush_tables
- tests/suite/flush_tables/r
- tests/suite/flush_tables/t
- tests/suite/identifiers
- tests/suite/identifiers/r
- tests/suite/identifiers/t
- tests/suite/regression
- tests/suite/regression/r
- tests/suite/regression/t
- tests/suite/slap
- tests/suite/slap/r
- tests/suite/slap/t
- tests/suite/tamil
- tests/suite/tamil/r
- tests/suite/tamil/t
- tests/suite/uuid_type
- tests/suite/uuid_type/r
- tests/suite/uuid_type/t
- unittests
- unittests/plugin
- win32
- win32/mingw
- win32/windows
- files renamed:
- docs/Doxyfile => Doxyfile
- config/pandora-plugin.ini => config/pandora_plugin_config.py
- drizzled/field/int64.cc => drizzled/field/int64_t.cc
- drizzled/field/int64.h => drizzled/field/int64_t.h
- drizzled/field/int32.cc => drizzled/field/long.cc
- drizzled/field/int32.h => drizzled/field/long.h
- plugin/math_functions/abs.cc => drizzled/function/math/abs.cc
- plugin/math_functions/abs.h => drizzled/function/math/abs.h
- plugin/math_functions/acos.cc => drizzled/function/math/acos.cc
- plugin/math_functions/acos.h => drizzled/function/math/acos.h
- plugin/math_functions/asin.cc => drizzled/function/math/asin.cc
- plugin/math_functions/asin.h => drizzled/function/math/asin.h
- plugin/math_functions/atan.cc => drizzled/function/math/atan.cc
- plugin/math_functions/atan.h => drizzled/function/math/atan.h
- plugin/math_functions/ceiling.cc => drizzled/function/math/ceiling.cc
- plugin/math_functions/ceiling.h => drizzled/function/math/ceiling.h
- plugin/math_functions/cos.cc => drizzled/function/math/cos.cc
- plugin/math_functions/cos.h => drizzled/function/math/cos.h
- plugin/math_functions/exp.cc => drizzled/function/math/exp.cc
- plugin/math_functions/exp.h => drizzled/function/math/exp.h
- plugin/math_functions/floor.cc => drizzled/function/math/floor.cc
- plugin/math_functions/floor.h => drizzled/function/math/floor.h
- plugin/math_functions/ln.cc => drizzled/function/math/ln.cc
- plugin/math_functions/ln.h => drizzled/function/math/ln.h
- plugin/math_functions/log.cc => drizzled/function/math/log.cc
- plugin/math_functions/log.h => drizzled/function/math/log.h
- plugin/math_functions/ord.cc => drizzled/function/math/ord.cc
- plugin/math_functions/ord.h => drizzled/function/math/ord.h
- plugin/math_functions/pow.cc => drizzled/function/math/pow.cc
- plugin/math_functions/pow.h => drizzled/function/math/pow.h
- plugin/math_functions/sin.cc => drizzled/function/math/sin.cc
- plugin/math_functions/sin.h => drizzled/function/math/sin.h
- plugin/math_functions/sqrt.cc => drizzled/function/math/sqrt.cc
- plugin/math_functions/sqrt.h => drizzled/function/math/sqrt.h
- plugin/string_functions/elt.cc => drizzled/function/str/elt.cc
- plugin/string_functions/elt.h => drizzled/function/str/elt.h
- plugin/string_functions/format.cc => drizzled/function/str/format.cc
- plugin/string_functions/format.h => drizzled/function/str/format.h
- plugin/string_functions/quote.cc => drizzled/function/str/quote.cc
- plugin/string_functions/quote.h => drizzled/function/str/quote.h
- drizzled/internal/iocache.cc => drizzled/internal/mf_cache.cc
- drizzled/utf8/utf8.h => drizzled/internal/utf8.h
- drizzled/locking/global.cc => drizzled/lock.cc
- drizzled/module/context.h => drizzled/plugin/context.h
- drizzled/module/library.cc => drizzled/plugin/library.cc
- drizzled/module/library.h => drizzled/plugin/library.h
- drizzled/module/load_list.h.in => drizzled/plugin/load_list.h.in
- drizzled/module/loader.cc => drizzled/plugin/loader.cc
- drizzled/module/manifest.h => drizzled/plugin/manifest.h
- drizzled/module/module.h => drizzled/plugin/module.h
- drizzled/module/registry.cc => drizzled/plugin/registry.cc
- drizzled/module/registry.h => drizzled/plugin/registry.h
- drizzled/identifier/schema.cc => drizzled/schema_identifier.cc
- drizzled/identifier/schema.h => drizzled/schema_identifier.h
- drizzled/session/cache.cc => drizzled/session_list.cc
- drizzled/session/cache.h => drizzled/session_list.h
- drizzled/sys_var.cc => drizzled/set_var.cc
- drizzled/sys_var.h => drizzled/set_var.h
- drizzled/identifier/table.cc => drizzled/table_identifier.cc
- drizzled/identifier/table.h => drizzled/table_identifier.h
- drizzled/definition/table.cc => drizzled/table_share.cc
- drizzled/definition/table.h => drizzled/table_share.h
- drizzled/unique.cc => drizzled/uniques.cc
- m4/pandora_have_libhaildb.m4 => m4/pandora_have_libinnodb.m4
- plugin/archive/tests/r/engine.result => plugin/archive/tests/r/archive.result
- plugin/archive/tests/r/aio_posix.result => plugin/archive/tests/r/archive_aio_posix.result
- plugin/archive/tests/r/basic.result => plugin/archive/tests/r/archive_basic.result
- plugin/archive/tests/r/discover.result => plugin/archive/tests/r/archive_discover.result
- plugin/archive/tests/t/master.opt => plugin/archive/tests/t/archive-master.opt
- plugin/archive/tests/t/engine.test => plugin/archive/tests/t/archive.test
- plugin/archive/tests/t/aio_posix.test => plugin/archive/tests/t/archive_aio_posix.test
- plugin/archive/tests/t/basic.test => plugin/archive/tests/t/archive_basic.test
- plugin/archive/tests/t/discover.test => plugin/archive/tests/t/archive_discover.test
- plugin/blackhole/tests/t/master.opt => plugin/blackhole/tests/t/blackhole-master.opt
- plugin/csv/tests/r/basic.result => plugin/csv/tests/r/csv.result
- plugin/csv/tests/r/alter_table.result => plugin/csv/tests/r/csv_alter_table.result
- plugin/csv/tests/r/not_null.result => plugin/csv/tests/r/csv_not_null.result
- plugin/csv/tests/t/master.opt => plugin/csv/tests/t/csv-master.opt
- plugin/csv/tests/t/basic.test => plugin/csv/tests/t/csv.test
- plugin/csv/tests/t/alter_table.test => plugin/csv/tests/t/csv_alter_table.test
- plugin/csv/tests/t/not_null.test => plugin/csv/tests/t/csv_not_null.test
- plugin/utility_functions/schema.cc => plugin/database_function/database_function.cc
- plugin/haildb/ => plugin/embedded_innodb/
- plugin/haildb/haildb_engine.cc => plugin/embedded_innodb/embedded_innodb_engine.cc
- plugin/haildb/haildb_engine.h => plugin/embedded_innodb/embedded_innodb_engine.h
- plugin/haildb/haildb_datadict_dump_func.cc => plugin/embedded_innodb/libinnodb_datadict_dump_func.cc
- plugin/haildb/haildb_datadict_dump_func.h => plugin/embedded_innodb/libinnodb_datadict_dump_func.h
- plugin/haildb/tests/r/haildb_datadict_dump_func.result => plugin/embedded_innodb/tests/r/libinnodb_datadict_dump_func.result
- plugin/haildb/tests/t/haildb_datadict_dump_func.test => plugin/embedded_innodb/tests/t/libinnodb_datadict_dump_func.test
- plugin/memory/ => plugin/heap/
- plugin/rot13/tests/r/basic.result => plugin/rot13/tests/r/rot13_basic.result
- plugin/rot13/tests/t/basic.test => plugin/rot13/tests/t/rot13_basic.test
- plugin/filtered_replicator/tests/r/filtered_replicator.result => plugin/transaction_log/tests/r/filtered_replicator.result
- plugin/filtered_replicator/tests/t/filtered_replicator-master.opt => plugin/transaction_log/tests/t/filtered_replicator-master.opt
- plugin/filtered_replicator/tests/t/filtered_replicator.test => plugin/transaction_log/tests/t/filtered_replicator.test
- plugin/utility_functions/user.cc => plugin/user_function/user_function.cc
- plugin/innobase/tests/r/deadlock_innodb.result => tests/r/deadlock_innodb.result
- plugin/innobase/tests/r/func_group_innodb.result => tests/r/func_group_innodb.result
- plugin/innobase/tests/r/group_min_max_innodb.result => tests/r/group_min_max_innodb.result
- plugin/memory/tests/r/basic.result => tests/r/heap.result
- plugin/memory/tests/r/heap_auto_increment.result => tests/r/heap_auto_increment.result
- plugin/memory/tests/r/heap_btree.result => tests/r/heap_btree.result
- plugin/memory/tests/r/heap_hash.result => tests/r/heap_hash.result
- plugin/memory/tests/r/heap_var.result => tests/r/heap_var.result
- plugin/innobase/tests/r/index_merge_innodb.result => tests/r/index_merge_innodb.result
- plugin/myisam/tests/r/index_merge_myisam.result => tests/r/index_merge_myisam.result
- plugin/innobase/tests/r/innodb-semi-consistent.result => tests/r/innodb-semi-consistent.result
- plugin/innobase/tests/r/innodb.result => tests/r/innodb.result
- plugin/innobase/tests/r/innodb_mysql.result => tests/r/innodb_mysql.result
- plugin/innobase/tests/r/innodb_notembedded.result => tests/r/innodb_notembedded.result
- plugin/innobase/tests/r/innodb_trx_weight.result => tests/r/innodb_trx_weight.result
- plugin/innobase/tests/r/join_outer_innodb.result => tests/r/join_outer_innodb.result
- plugin/myisam/tests/r/key_cache.result => tests/r/key_cache.result
- plugin/innobase/tests/r/loaddata_autocom_innodb.result => tests/r/loaddata_autocom_innodb.result
- plugin/myisam/tests/r/mix2_myisam.result => tests/r/mix2_myisam.result
- plugin/myisam/tests/r/blob.result => tests/r/myisam-blob.result
- plugin/myisam/tests/r/basic.result => tests/r/myisam.result
- plugin/myisam/tests/r/rollback.result => tests/r/myisam_rollback.result
- tests/r/drizzle_client.result => tests/r/mysql.result
- tests/r/drizzledump-max.result => tests/r/mysqldump-max.result
- plugin/innobase/tests/r/parser_bug21114_innodb.result => tests/r/parser_bug21114_innodb.result
- plugin/innobase/tests/r/rowid_order_innodb.result => tests/r/rowid_order_innodb.result
- plugin/innobase/tests/r/subselect_innodb.result => tests/r/subselect_innodb.result
- plugin/innobase/tests/r/unsafe_binlog_innodb.result => tests/r/unsafe_binlog_innodb.result
- tests/suite/jp/r/alter_utf8.result => tests/suite/jp/r/jp_alter_utf8.result
- tests/suite/jp/r/charlength_utf8.result => tests/suite/jp/r/jp_charlength_utf8.result
- tests/suite/jp/r/create_db_utf8.result => tests/suite/jp/r/jp_create_db_utf8.result
- tests/suite/jp/r/create_tbl_utf8.result => tests/suite/jp/r/jp_create_tbl_utf8.result
- tests/suite/jp/r/enum_utf8.result => tests/suite/jp/r/jp_enum_utf8.result
- tests/suite/jp/r/insert_utf8.result => tests/suite/jp/r/jp_insert_utf8.result
- tests/suite/jp/r/instr_utf8.result => tests/suite/jp/r/jp_instr_utf8.result
- tests/suite/jp/r/join_utf8.result => tests/suite/jp/r/jp_join_utf8.result
- tests/suite/jp/r/left_utf8.result => tests/suite/jp/r/jp_left_utf8.result
- tests/suite/jp/r/length_utf8.result => tests/suite/jp/r/jp_length_utf8.result
- tests/suite/jp/r/like_utf8.result => tests/suite/jp/r/jp_like_utf8.result
- tests/suite/jp/r/locate_utf8.result => tests/suite/jp/r/jp_locate_utf8.result
- tests/suite/jp/r/lpad_utf8.result => tests/suite/jp/r/jp_lpad_utf8.result
- tests/suite/jp/r/ltrim_utf8.result => tests/suite/jp/r/jp_ltrim_utf8.result
- tests/suite/jp/r/replace_utf8.result => tests/suite/jp/r/jp_replace_utf8.result
- tests/suite/jp/r/reverse_utf8.result => tests/suite/jp/r/jp_reverse_utf8.result
- tests/suite/jp/r/right_utf8.result => tests/suite/jp/r/jp_right_utf8.result
- tests/suite/jp/r/rpad_utf8.result => tests/suite/jp/r/jp_rpad_utf8.result
- tests/suite/jp/r/rtrim_utf8.result => tests/suite/jp/r/jp_rtrim_utf8.result
- tests/suite/jp/r/select_utf8.result => tests/suite/jp/r/jp_select_utf8.result
- tests/suite/jp/r/subquery_utf8.result => tests/suite/jp/r/jp_subquery_utf8.result
- tests/suite/jp/r/substring_utf8.result => tests/suite/jp/r/jp_substring_utf8.result
- tests/suite/jp/r/trim_utf8.result => tests/suite/jp/r/jp_trim_utf8.result
- tests/suite/jp/r/update_utf8.result => tests/suite/jp/r/jp_update_utf8.result
- tests/suite/jp/r/where_utf8.result => tests/suite/jp/r/jp_where_utf8.result
- tests/suite/jp/t/alter_utf8.test => tests/suite/jp/t/jp_alter_utf8.test
- tests/suite/jp/t/charlength_utf8.test => tests/suite/jp/t/jp_charlength_utf8.test
- tests/suite/jp/t/create_db_utf8.test => tests/suite/jp/t/jp_create_db_utf8.test
- tests/suite/jp/t/create_tbl_utf8.test => tests/suite/jp/t/jp_create_tbl_utf8.test
- tests/suite/jp/t/enum_utf8.test => tests/suite/jp/t/jp_enum_utf8.test
- tests/suite/jp/t/insert_utf8.test => tests/suite/jp/t/jp_insert_utf8.test
- tests/suite/jp/t/instr_utf8.test => tests/suite/jp/t/jp_instr_utf8.test
- tests/suite/jp/t/join_utf8.test => tests/suite/jp/t/jp_join_utf8.test
- tests/suite/jp/t/left_utf8.test => tests/suite/jp/t/jp_left_utf8.test
- tests/suite/jp/t/length_utf8.test => tests/suite/jp/t/jp_length_utf8.test
- tests/suite/jp/t/like_utf8.test => tests/suite/jp/t/jp_like_utf8.test
- tests/suite/jp/t/locate_utf8.test => tests/suite/jp/t/jp_locate_utf8.test
- tests/suite/jp/t/lpad_utf8.test => tests/suite/jp/t/jp_lpad_utf8.test
- tests/suite/jp/t/ltrim_utf8.test => tests/suite/jp/t/jp_ltrim_utf8.test
- tests/suite/jp/t/replace_utf8.test => tests/suite/jp/t/jp_replace_utf8.test
- tests/suite/jp/t/reverse_utf8.test => tests/suite/jp/t/jp_reverse_utf8.test
- tests/suite/jp/t/right_utf8.test => tests/suite/jp/t/jp_right_utf8.test
- tests/suite/jp/t/rpad_utf8.test => tests/suite/jp/t/jp_rpad_utf8.test
- tests/suite/jp/t/rtrim_utf8.test => tests/suite/jp/t/jp_rtrim_utf8.test
- tests/suite/jp/t/select_utf8.test => tests/suite/jp/t/jp_select_utf8.test
- tests/suite/jp/t/subquery_utf8.test => tests/suite/jp/t/jp_subquery_utf8.test
- tests/suite/jp/t/substring_utf8.test => tests/suite/jp/t/jp_substring_utf8.test
- tests/suite/jp/t/trim_utf8.test => tests/suite/jp/t/jp_trim_utf8.test
- tests/suite/jp/t/update_utf8.test => tests/suite/jp/t/jp_update_utf8.test
- tests/suite/jp/t/where_utf8.test => tests/suite/jp/t/jp_where_utf8.test
- plugin/innobase/tests/t/deadlock_innodb.test => tests/t/deadlock_innodb.test
- plugin/innobase/tests/t/func_group_innodb.test => tests/t/func_group_innodb.test
- plugin/innobase/tests/t/group_min_max_innodb.test => tests/t/group_min_max_innodb.test
- plugin/memory/tests/t/basic.test => tests/t/heap.test
- plugin/memory/tests/t/heap_auto_increment.test => tests/t/heap_auto_increment.test
- plugin/memory/tests/t/heap_btree.test => tests/t/heap_btree.test
- plugin/memory/tests/t/heap_hash.test => tests/t/heap_hash.test
- plugin/memory/tests/t/heap_var.test => tests/t/heap_var.test
- plugin/innobase/tests/t/index_merge_innodb.test => tests/t/index_merge_innodb.test
- plugin/myisam/tests/t/index_merge_myisam.test => tests/t/index_merge_myisam.test
- plugin/innobase/tests/t/innodb-semi-consistent.test => tests/t/innodb-semi-consistent.test
- plugin/innobase/tests/t/innodb.test => tests/t/innodb.test
- plugin/innobase/tests/t/innodb_mysql.test => tests/t/innodb_mysql.test
- plugin/innobase/tests/t/innodb_notembedded.test => tests/t/innodb_notembedded.test
- plugin/innobase/tests/t/innodb_trx_weight.test => tests/t/innodb_trx_weight.test
- plugin/innobase/tests/t/join_outer_innodb.test => tests/t/join_outer_innodb.test
- plugin/innobase/tests/t/loaddata_autocom_innodb.test => tests/t/loaddata_autocom_innodb.test
- plugin/myisam/tests/t/mix2_myisam.test => tests/t/mix2_myisam.test
- plugin/myisam/tests/t/blob-master.opt => tests/t/myisam-blob-master.opt
- plugin/myisam/tests/t/blob.test => tests/t/myisam-blob.test
- plugin/myisam/tests/t/basic.test => tests/t/myisam.test
- plugin/myisam/tests/t/rollback.test => tests/t/myisam_rollback.test
- tests/t/drizzle_client.test => tests/t/mysql.test
- tests/t/drizzledump-max.test => tests/t/mysqldump-max.test
- plugin/innobase/tests/t/parser_bug21114_innodb.test => tests/t/parser_bug21114_innodb.test
- plugin/innobase/tests/t/rowid_order_innodb.test => tests/t/rowid_order_innodb.test
- plugin/innobase/tests/t/subselect_innodb.test => tests/t/subselect_innodb.test
- plugin/innobase/tests/t/unsafe_binlog_innodb-master.opt => tests/t/unsafe_binlog_innodb-master.opt
- plugin/innobase/tests/t/unsafe_binlog_innodb.test => tests/t/unsafe_binlog_innodb.test
- files modified:
- .bzrignore
added
removed
plugin/session_dictionary/dictionary.h
