« back to all changes in this revision
Viewing changes to plugin/pbms/src/cslib/CSSha1.cc
- Committer: Brian Aker
- Date: 2010-10-20 22:53:36 UTC
- mfrom: (1859.2.14 refactor)
- mto: (1864.1.3 build)
- mto: This revision was merged to the branch mainline in revision 1865.
- Revision ID: brian@tangent.org-20101020225336-9u8waoue8q0dmob3
Fix merge issue.
- files added:
- client/errname.cc
- plugin/database_function
- plugin/errmsg_notify
- plugin/errmsg_notify/tests
- plugin/errmsg_notify/tests/r
- plugin/errmsg_notify/tests/t
- plugin/user_function
- win32/mingw
- files removed:
- client/server_detect.h
- docs/functions
- docs/functions/string
- docs/installing
- docs/resources
- docs/testing
- drizzled/catalog
- drizzled/definition
- drizzled/error
- drizzled/function/cast
- drizzled/generator/catalog
- drizzled/identifier/constants
- drizzled/item/function
- drizzled/locking
- drizzled/plugin/client
- drizzled/schema
- drizzled/session
- drizzled/statement/catalog
- drizzled/statement/create_table
- drizzled/table/instance
- drizzled/type
- plugin/catalog
- plugin/catalog/functions
- plugin/catalog/tables
- plugin/catalog/tests
- plugin/catalog/tests/r
- plugin/catalog/tests/t
- 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/filtered_replicator/tests
- plugin/filtered_replicator/tests/r
- plugin/filtered_replicator/tests/t
- plugin/haildb/docs
- plugin/mysql_protocol/docs
- plugin/mysql_unix_socket_protocol
- plugin/pbms/tests
- plugin/pbms/tests/r
- plugin/pbms/tests/t
- plugin/protocol_dictionary
- 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/tests
- plugin/string_functions/tests/r
- plugin/string_functions/tests/t
- plugin/transaction_log/utilities
- plugin/utility_functions
- plugin/utility_functions/tests
- plugin/utility_functions/tests/r
- plugin/utility_functions/tests/t
- tests/dbqp_data
- tests/lib/drizzle_test_run
- tests/lib/server_mgmt
- tests/lib/sys_mgmt
- tests/lib/test_mgmt
- tests/suite/bool_type
- tests/suite/bool_type/r
- tests/suite/bool_type/t
- tests/suite/cast
- tests/suite/cast/r
- tests/suite/cast/t
- tests/suite/ddl_transactions
- tests/suite/ddl_transactions/r
- tests/suite/ddl_transactions/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/microtime_type
- tests/suite/microtime_type/r
- tests/suite/microtime_type/t
- tests/suite/mysql_compatibility
- tests/suite/mysql_compatibility/r
- tests/suite/mysql_compatibility/t
- tests/suite/slap
- tests/suite/slap/r
- tests/suite/slap/t
- tests/suite/time_type
- tests/suite/time_type/r
- tests/suite/time_type/t
- tests/suite/unsigned_integer_type
- tests/suite/unsigned_integer_type/r
- tests/suite/unsigned_integer_type/t
- tests/suite/uuid_type
- tests/suite/uuid_type/r
- tests/suite/uuid_type/t
- files renamed:
- drizzled/schema.cc => drizzled/db.cc
- drizzled/schema.h => drizzled/db.h
- drizzled/type/decimal.cc => drizzled/decimal.cc
- drizzled/type/decimal.h => drizzled/decimal.h
- drizzled/type/time.cc => drizzled/drizzle_time.cc
- drizzled/type/time.h => drizzled/drizzle_time.h
- 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
- drizzled/field/epoch.cc => drizzled/field/timestamp.cc
- drizzled/field/epoch.h => drizzled/field/timestamp.h
- drizzled/dtoa.cc => drizzled/internal/dtoa.cc
- drizzled/internal/iocache.cc => drizzled/internal/mf_cache.cc
- drizzled/my_strtoll10.cc => drizzled/internal/my_strtoll10.cc
- drizzled/locking/global.cc => drizzled/lock.cc
- 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/error/sql_state.cc => drizzled/sql_state.cc
- drizzled/error/sql_state.h => drizzled/sql_state.h
- drizzled/table/singular.cc => drizzled/table/instance.cc
- drizzled/table/singular.h => drizzled/table/instance.h
- drizzled/table/instance/base.cc => drizzled/table_share.cc
- drizzled/table/instance/base.h => drizzled/table_share.h
- libdrizzle/mysql_password_hash.cc => extra/mysql_password_hash.c
- m4/pandora_compile_stdcxx_0x.m4 => m4/ac_cxx_compile_stdcxx_0x.m4
- m4/pandora_header_stdcxx_98.m4 => m4/ac_cxx_header_stdcxx_98.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/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/blitzdb/tests/r/alter.result => plugin/blitzdb/tests/r/blitzdb-alter.result
- plugin/blitzdb/tests/r/basic.result => plugin/blitzdb/tests/r/blitzdb-basic.result
- plugin/blitzdb/tests/r/decimal.result => plugin/blitzdb/tests/r/blitzdb-decimal.result
- plugin/blitzdb/tests/r/index.result => plugin/blitzdb/tests/r/blitzdb-index.result
- plugin/blitzdb/tests/r/indexes.result => plugin/blitzdb/tests/r/blitzdb-indexes.result
- plugin/blitzdb/tests/r/join.result => plugin/blitzdb/tests/r/blitzdb-join.result
- plugin/blitzdb/tests/r/range.result => plugin/blitzdb/tests/r/blitzdb-range.result
- plugin/blitzdb/tests/t/alter.test => plugin/blitzdb/tests/t/blitzdb-alter.test
- plugin/blitzdb/tests/t/basic.test => plugin/blitzdb/tests/t/blitzdb-basic.test
- plugin/blitzdb/tests/t/decimal.test => plugin/blitzdb/tests/t/blitzdb-decimal.test
- plugin/blitzdb/tests/t/index.test => plugin/blitzdb/tests/t/blitzdb-index.test
- plugin/blitzdb/tests/t/indexes.test => plugin/blitzdb/tests/t/blitzdb-indexes.test
- plugin/blitzdb/tests/t/join.test => plugin/blitzdb/tests/t/blitzdb-join.test
- plugin/blitzdb/tests/t/range.test => plugin/blitzdb/tests/t/blitzdb-range.test
- plugin/debug/ => plugin/crash_function/
- 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/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/innobase/btr/btr0btr.cc => plugin/innobase/btr/btr0btr.c
- plugin/innobase/btr/btr0cur.cc => plugin/innobase/btr/btr0cur.c
- plugin/innobase/btr/btr0pcur.cc => plugin/innobase/btr/btr0pcur.c
- plugin/innobase/btr/btr0sea.cc => plugin/innobase/btr/btr0sea.c
- plugin/innobase/buf/buf0buddy.cc => plugin/innobase/buf/buf0buddy.c
- plugin/innobase/buf/buf0buf.cc => plugin/innobase/buf/buf0buf.c
- plugin/innobase/buf/buf0flu.cc => plugin/innobase/buf/buf0flu.c
- plugin/innobase/buf/buf0lru.cc => plugin/innobase/buf/buf0lru.c
- plugin/innobase/buf/buf0rea.cc => plugin/innobase/buf/buf0rea.c
- plugin/innobase/data/data0data.cc => plugin/innobase/data/data0data.c
- plugin/innobase/data/data0type.cc => plugin/innobase/data/data0type.c
- plugin/innobase/dict/dict0boot.cc => plugin/innobase/dict/dict0boot.c
- plugin/innobase/dict/dict0crea.cc => plugin/innobase/dict/dict0crea.c
- plugin/innobase/dict/dict0dict.cc => plugin/innobase/dict/dict0dict.c
- plugin/innobase/dict/dict0load.cc => plugin/innobase/dict/dict0load.c
- plugin/innobase/dict/dict0mem.cc => plugin/innobase/dict/dict0mem.c
- plugin/innobase/dyn/dyn0dyn.cc => plugin/innobase/dyn/dyn0dyn.c
- plugin/innobase/eval/eval0eval.cc => plugin/innobase/eval/eval0eval.c
- plugin/innobase/eval/eval0proc.cc => plugin/innobase/eval/eval0proc.c
- plugin/innobase/fil/fil0fil.cc => plugin/innobase/fil/fil0fil.c
- plugin/innobase/fsp/fsp0fsp.cc => plugin/innobase/fsp/fsp0fsp.c
- plugin/innobase/fut/fut0fut.cc => plugin/innobase/fut/fut0fut.c
- plugin/innobase/fut/fut0lst.cc => plugin/innobase/fut/fut0lst.c
- plugin/innobase/ha/ha0ha.cc => plugin/innobase/ha/ha0ha.c
- plugin/innobase/ha/ha0storage.cc => plugin/innobase/ha/ha0storage.c
- plugin/innobase/ha/hash0hash.cc => plugin/innobase/ha/hash0hash.c
- plugin/innobase/ibuf/ibuf0ibuf.cc => plugin/innobase/ibuf/ibuf0ibuf.c
- plugin/innobase/lock/lock0iter.cc => plugin/innobase/lock/lock0iter.c
- plugin/innobase/lock/lock0lock.cc => plugin/innobase/lock/lock0lock.c
- plugin/innobase/log/log0log.cc => plugin/innobase/log/log0log.c
- plugin/innobase/log/log0recv.cc => plugin/innobase/log/log0recv.c
- plugin/innobase/mach/mach0data.cc => plugin/innobase/mach/mach0data.c
- plugin/innobase/mem/mem0dbg.cc => plugin/innobase/mem/mem0dbg.c
- plugin/innobase/mem/mem0mem.cc => plugin/innobase/mem/mem0mem.c
- plugin/innobase/mem/mem0pool.cc => plugin/innobase/mem/mem0pool.c
- plugin/innobase/mtr/mtr0log.cc => plugin/innobase/mtr/mtr0log.c
- plugin/innobase/mtr/mtr0mtr.cc => plugin/innobase/mtr/mtr0mtr.c
- plugin/innobase/os/os0file.cc => plugin/innobase/os/os0file.c
- plugin/innobase/os/os0proc.cc => plugin/innobase/os/os0proc.c
- plugin/innobase/os/os0sync.cc => plugin/innobase/os/os0sync.c
- plugin/innobase/os/os0thread.cc => plugin/innobase/os/os0thread.c
- plugin/innobase/page/page0cur.cc => plugin/innobase/page/page0cur.c
- plugin/innobase/page/page0page.cc => plugin/innobase/page/page0page.c
- plugin/innobase/page/page0zip.cc => plugin/innobase/page/page0zip.c
- plugin/innobase/pars/pars0opt.cc => plugin/innobase/pars/pars0opt.c
- plugin/innobase/pars/pars0pars.cc => plugin/innobase/pars/pars0pars.c
- plugin/innobase/pars/pars0sym.cc => plugin/innobase/pars/pars0sym.c
- plugin/innobase/que/que0que.cc => plugin/innobase/que/que0que.c
- plugin/innobase/read/read0read.cc => plugin/innobase/read/read0read.c
- plugin/innobase/rem/rem0cmp.cc => plugin/innobase/rem/rem0cmp.c
- plugin/innobase/rem/rem0rec.cc => plugin/innobase/rem/rem0rec.c
- plugin/innobase/row/row0ext.cc => plugin/innobase/row/row0ext.c
- plugin/innobase/row/row0ins.cc => plugin/innobase/row/row0ins.c
- plugin/innobase/row/row0merge.cc => plugin/innobase/row/row0merge.c
- plugin/innobase/row/row0mysql.cc => plugin/innobase/row/row0mysql.c
- plugin/innobase/row/row0purge.cc => plugin/innobase/row/row0purge.c
- plugin/innobase/row/row0row.cc => plugin/innobase/row/row0row.c
- plugin/innobase/row/row0sel.cc => plugin/innobase/row/row0sel.c
- plugin/innobase/row/row0uins.cc => plugin/innobase/row/row0uins.c
- plugin/innobase/row/row0umod.cc => plugin/innobase/row/row0umod.c
- plugin/innobase/row/row0undo.cc => plugin/innobase/row/row0undo.c
- plugin/innobase/row/row0upd.cc => plugin/innobase/row/row0upd.c
- plugin/innobase/row/row0vers.cc => plugin/innobase/row/row0vers.c
- plugin/innobase/srv/srv0srv.cc => plugin/innobase/srv/srv0srv.c
- plugin/innobase/srv/srv0start.cc => plugin/innobase/srv/srv0start.c
- plugin/innobase/sync/sync0arr.cc => plugin/innobase/sync/sync0arr.c
- plugin/innobase/sync/sync0rw.cc => plugin/innobase/sync/sync0rw.c
- plugin/innobase/sync/sync0sync.cc => plugin/innobase/sync/sync0sync.c
- plugin/innobase/thr/thr0loc.cc => plugin/innobase/thr/thr0loc.c
- plugin/innobase/trx/trx0i_s.cc => plugin/innobase/trx/trx0i_s.c
- plugin/innobase/trx/trx0purge.cc => plugin/innobase/trx/trx0purge.c
- plugin/innobase/trx/trx0rec.cc => plugin/innobase/trx/trx0rec.c
- plugin/innobase/trx/trx0roll.cc => plugin/innobase/trx/trx0roll.c
- plugin/innobase/trx/trx0rseg.cc => plugin/innobase/trx/trx0rseg.c
- plugin/innobase/trx/trx0sys.cc => plugin/innobase/trx/trx0sys.c
- plugin/innobase/trx/trx0trx.cc => plugin/innobase/trx/trx0trx.c
- plugin/innobase/trx/trx0undo.cc => plugin/innobase/trx/trx0undo.c
- plugin/innobase/usr/usr0sess.cc => plugin/innobase/usr/usr0sess.c
- plugin/innobase/ut/ut0byte.cc => plugin/innobase/ut/ut0byte.c
- plugin/innobase/ut/ut0dbg.cc => plugin/innobase/ut/ut0dbg.c
- plugin/innobase/ut/ut0list.cc => plugin/innobase/ut/ut0list.c
- plugin/innobase/ut/ut0mem.cc => plugin/innobase/ut/ut0mem.c
- plugin/innobase/ut/ut0rnd.cc => plugin/innobase/ut/ut0rnd.c
- plugin/innobase/ut/ut0ut.cc => plugin/innobase/ut/ut0ut.c
- plugin/innobase/ut/ut0vec.cc => plugin/innobase/ut/ut0vec.c
- plugin/innobase/ut/ut0wqueue.cc => plugin/innobase/ut/ut0wqueue.c
- plugin/memory/tests/r/basic.result => plugin/memory/tests/r/heap.result
- plugin/memory/tests/t/basic.test => plugin/memory/tests/t/heap.test
- plugin/myisam/tests/r/blob.result => plugin/myisam/tests/r/myisam-blob.result
- plugin/myisam/tests/r/basic.result => plugin/myisam/tests/r/myisam.result
- plugin/myisam/tests/r/rollback.result => plugin/myisam/tests/r/myisam_rollback.result
- plugin/myisam/tests/t/blob-master.opt => plugin/myisam/tests/t/myisam-blob-master.opt
- plugin/myisam/tests/t/blob.test => plugin/myisam/tests/t/myisam-blob.test
- plugin/myisam/tests/t/basic.test => plugin/myisam/tests/t/myisam.test
- plugin/myisam/tests/t/rollback.test => plugin/myisam/tests/t/myisam_rollback.test
- 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/session_dictionary/tests/t/slap.disabled => plugin/session_dictionary/tests/t/slap.test
- plugin/utility_functions/user.cc => plugin/user_function/user_function.cc
- tests/suite/execute/r/basic.result => tests/r/execute.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
- tests/suite/tamil/r/utf8_create_database.result => tests/suite/tamil/r/tamil_utf8_create_database.result
- tests/suite/tamil/r/utf8_create_table.result => tests/suite/tamil/r/tamil_utf8_create_table.result
- tests/suite/tamil/t/utf8_create_database.test => tests/suite/tamil/t/tamil_utf8_create_database.test
- tests/suite/tamil/t/utf8_create_table.test => tests/suite/tamil/t/tamil_utf8_create_table.test
- tests/suite/execute/t/basic.test => tests/t/execute.test
- files modified:
- .bzrignore
added
removed
plugin/pbms/src/cslib/CSSha1.cc
