« back to all changes in this revision
Viewing changes to drizzled/lock.cc
- Committer: Brian Aker
- Date: 2008-12-06 23:57:32 UTC
- mfrom: (656.1.10 devel)
- Revision ID: brian@tangent.org-20081206235732-jx228bczpvmxu8ww
Merge from Monty
- files added:
- drizzled/item/basic_constant.h
- tests/r
- tests/suite/broken
- tests/t
- files removed:
- mystrings/stpcpy.cc
- files renamed:
- tests/r/1st.result => tests/r/1st.result
- tests/r/alter_table.result => tests/r/alter_table.result
- tests/r/bench_count_distinct.result => tests/r/bench_count_distinct.result
- tests/r/bigint.result => tests/r/bigint.result
- tests/r/binlog_index.result => tests/r/binlog_index.result
- tests/r/bulk_replace.result => tests/r/bulk_replace.result
- tests/r/comment_column.result => tests/r/comment_column.result
- tests/r/comment_column2.result => tests/r/comment_column2.result
- tests/r/comment_index.result => tests/r/comment_index.result
- tests/r/comment_table.result => tests/r/comment_table.result
- tests/r/comments.result => tests/r/comments.result
- tests/r/commit_1innodb.result => tests/r/commit_1innodb.result
- tests/r/compare.result => tests/r/compare.result
- tests/r/consistent_snapshot.result => tests/r/consistent_snapshot.result
- tests/r/constraints.result => tests/r/constraints.result
- tests/r/count_distinct.result => tests/r/count_distinct.result
- tests/r/count_distinct2.result => tests/r/count_distinct2.result
- tests/r/count_distinct3.result => tests/r/count_distinct3.result
- tests/r/create_select_tmp.result => tests/r/create_select_tmp.result
- tests/r/ctype_filename.result => tests/r/ctype_filename.result
- tests/r/date_formats.result => tests/r/date_formats.result
- tests/r/delete.result => tests/r/delete.result
- tests/r/distinct.result => tests/r/distinct.result
- tests/r/drizzleslap.result => tests/r/drizzleslap.result
- tests/r/drop_table.result => tests/r/drop_table.result
- tests/r/drop_table_if_exists.result => tests/r/drop_table_if_exists.result
- tests/r/drop_table_temp.result => tests/r/drop_table_temp.result
- tests/r/empty_table.result => tests/r/empty_table.result
- tests/r/endspace.result => tests/r/endspace.result
- tests/r/flush2.result => tests/r/flush2.result
- tests/r/func_compress.result => tests/r/func_compress.result
- tests/r/func_concat.result => tests/r/func_concat.result
- tests/r/func_crc32.result => tests/r/func_crc32.result
- tests/r/func_date_add.result => tests/r/func_date_add.result
- tests/r/func_default.result => tests/r/func_default.result
- tests/r/func_equal.result => tests/r/func_equal.result
- tests/r/func_gconcat.result => tests/r/func_gconcat.result
- tests/r/func_group.result => tests/r/func_group.result
- tests/r/func_group_innodb.result => tests/r/func_group_innodb.result
- tests/r/func_if.result => tests/r/func_if.result
- tests/r/func_in.result => tests/r/func_in.result
- tests/r/func_isnull.result => tests/r/func_isnull.result
- tests/r/func_like.result => tests/r/func_like.result
- tests/r/func_math.result => tests/r/func_math.result
- tests/r/func_misc.result => tests/r/func_misc.result
- tests/r/func_op.result => tests/r/func_op.result
- tests/r/func_sapdb.result => tests/r/func_sapdb.result
- tests/r/func_str.result => tests/r/func_str.result
- tests/r/func_time.result => tests/r/func_time.result
- tests/r/func_weight_string.result => tests/r/func_weight_string.result
- tests/r/greedy_optimizer.result => tests/r/greedy_optimizer.result
- tests/r/group_by.result => tests/r/group_by.result
- tests/r/group_min_max_innodb.result => tests/r/group_min_max_innodb.result
- tests/r/have_log_bin.require => tests/r/have_log_bin.require
- tests/r/having.result => tests/r/having.result
- tests/r/heap.result => tests/r/heap.result
- tests/r/heap_auto_increment.result => tests/r/heap_auto_increment.result
- tests/r/heap_btree.result => tests/r/heap_btree.result
- tests/r/heap_hash.result => tests/r/heap_hash.result
- tests/r/heap_var.result => tests/r/heap_var.result
- tests/r/information_schema.result => tests/r/information_schema.result
- tests/r/innodb-lock.result => tests/r/innodb-lock.result
- tests/r/innodb-semi-consistent.result => tests/r/innodb-semi-consistent.result
- tests/t/innodb_autoinc_lock_mode_zero-master.opt => tests/r/innodb_autoinc_lock_mode_zero-master.opt
- tests/r/innodb_autoinc_lock_mode_zero.result => tests/r/innodb_autoinc_lock_mode_zero.result
- tests/r/innodb_mysql.result => tests/r/innodb_mysql.result
- tests/r/innodb_notembedded.result => tests/r/innodb_notembedded.result
- tests/r/innodb_timeout_rollback.result => tests/r/innodb_timeout_rollback.result
- tests/r/innodb_trx_weight.result => tests/r/innodb_trx_weight.result
- tests/r/insert.result => tests/r/insert.result
- tests/r/insert_select.result => tests/r/insert_select.result
- tests/r/insert_update.result => tests/r/insert_update.result
- tests/r/join.result => tests/r/join.result
- tests/r/join_crash.result => tests/r/join_crash.result
- tests/r/join_nested.result => tests/r/join_nested.result
- tests/r/join_outer.result => tests/r/join_outer.result
- tests/r/join_outer_innodb.result => tests/r/join_outer_innodb.result
- tests/r/key.result => tests/r/key.result
- tests/r/key_diff.result => tests/r/key_diff.result
- tests/r/key_primary.result => tests/r/key_primary.result
- tests/r/keywords.result => tests/r/keywords.result
- tests/r/kill.result => tests/r/kill.result
- tests/r/limit.result => tests/r/limit.result
- tests/r/lock.result => tests/r/lock.result
- tests/r/lock_tables_lost_commit.result => tests/r/lock_tables_lost_commit.result
- tests/r/myisam-blob.result => tests/r/myisam-blob.result
- tests/r/mysqldump-compat.result => tests/r/mysqldump-compat.result
- tests/r/mysqldump-max.result => tests/r/mysqldump-max.result
- tests/r/order_by.result => tests/r/order_by.result
- tests/r/order_fill_sortbuf.result => tests/r/order_fill_sortbuf.result
- tests/r/overflow.result => tests/r/overflow.result
- tests/r/parser.result => tests/r/parser.result
- tests/r/parser_bug21114_innodb.result => tests/r/parser_bug21114_innodb.result
- tests/r/parser_precedence.result => tests/r/parser_precedence.result
- tests/r/pool_of_threads.result => tests/r/pool_of_threads.result
- tests/r/range.result => tests/r/range.result
- tests/r/replace.result => tests/r/replace.result
- tests/r/rollback.result => tests/r/rollback.result
- tests/r/round.result => tests/r/round.result
- tests/r/row.result => tests/r/row.result
- tests/r/rowid_order_innodb.result => tests/r/rowid_order_innodb.result
- tests/r/schema.result => tests/r/schema.result
- tests/r/select.result => tests/r/select.result
- tests/r/subselect.result => tests/r/subselect.result
- tests/r/subselect3.result => tests/r/subselect3.result
- tests/r/subselect_innodb.result => tests/r/subselect_innodb.result
- tests/r/sum_distinct.result => tests/r/sum_distinct.result
- tests/r/synchronization.result => tests/r/synchronization.result
- tests/r/tablelock.result => tests/r/tablelock.result
- tests/r/true.require => tests/r/true.require
- tests/r/type_blob.result => tests/r/type_blob.result
- tests/r/type_date.result => tests/r/type_date.result
- tests/r/type_datetime.result => tests/r/type_datetime.result
- tests/r/type_float.result => tests/r/type_float.result
- tests/r/type_newdecimal.result => tests/r/type_newdecimal.result
- tests/r/type_ranges.result => tests/r/type_ranges.result
- tests/r/type_time.result => tests/r/type_time.result
- tests/r/type_timestamp.result => tests/r/type_timestamp.result
- tests/r/type_uint.result => tests/r/type_uint.result
- tests/r/type_varchar.result => tests/r/type_varchar.result
- tests/r/unsafe_binlog_innodb.result => tests/r/unsafe_binlog_innodb.result
- tests/r/update.result => tests/r/update.result
- tests/r/variables-notembedded.result => tests/r/variables-notembedded.result
- tests/r/ => tests/suite/broken/r/
- tests/t/ => tests/suite/broken/t/
- tests/t/1st.test => tests/t/1st.test
- tests/t/alter_table.test => tests/t/alter_table.test
- tests/t/bench_count_distinct.test => tests/t/bench_count_distinct.test
- tests/t/bigint.test => tests/t/bigint.test
- tests/t/binlog_index.test => tests/t/binlog_index.test
- tests/t/bulk_replace.test => tests/t/bulk_replace.test
- tests/t/comment_column.test => tests/t/comment_column.test
- tests/t/comment_column2.test => tests/t/comment_column2.test
- tests/t/comment_index.test => tests/t/comment_index.test
- tests/t/comment_table.test => tests/t/comment_table.test
- tests/t/comments.test => tests/t/comments.test
- tests/t/commit_1innodb.test => tests/t/commit_1innodb.test
- tests/t/compare.test => tests/t/compare.test
- tests/t/consistent_snapshot.test => tests/t/consistent_snapshot.test
- tests/t/constraints.test => tests/t/constraints.test
- tests/t/count_distinct.test => tests/t/count_distinct.test
- tests/t/count_distinct2.test => tests/t/count_distinct2.test
- tests/t/count_distinct3.test => tests/t/count_distinct3.test
- tests/t/create_select_tmp.test => tests/t/create_select_tmp.test
- tests/t/ctype_filename.test => tests/t/ctype_filename.test
- tests/t/date_formats-master.opt => tests/t/date_formats-master.opt
- tests/t/date_formats.test => tests/t/date_formats.test
- tests/t/delete.test => tests/t/delete.test
- tests/t/distinct.test => tests/t/distinct.test
- tests/t/drizzleslap.test => tests/t/drizzleslap.test
- tests/t/drop_table.test => tests/t/drop_table.test
- tests/t/drop_table_if_exists.test => tests/t/drop_table_if_exists.test
- tests/t/drop_table_temp.test => tests/t/drop_table_temp.test
- tests/t/empty_table.test => tests/t/empty_table.test
- tests/t/endspace.test => tests/t/endspace.test
- tests/t/flush2.test => tests/t/flush2.test
- tests/t/func_compress.test => tests/t/func_compress.test
- tests/t/func_concat.test => tests/t/func_concat.test
- tests/t/func_crc32.test => tests/t/func_crc32.test
- tests/t/func_date_add.test => tests/t/func_date_add.test
- tests/t/func_default.test => tests/t/func_default.test
- tests/t/func_equal.test => tests/t/func_equal.test
- tests/t/func_gconcat.test => tests/t/func_gconcat.test
- tests/t/func_group.test => tests/t/func_group.test
- tests/t/func_group_innodb.test => tests/t/func_group_innodb.test
- tests/t/func_if.test => tests/t/func_if.test
- tests/t/func_in.test => tests/t/func_in.test
- tests/t/func_isnull.test => tests/t/func_isnull.test
- tests/t/func_like.test => tests/t/func_like.test
- tests/t/func_math.test => tests/t/func_math.test
- tests/t/func_misc.test => tests/t/func_misc.test
- tests/t/func_op.test => tests/t/func_op.test
- tests/t/func_sapdb.test => tests/t/func_sapdb.test
- tests/t/func_str.test => tests/t/func_str.test
- tests/t/func_time.test => tests/t/func_time.test
- tests/t/func_weight_string.test => tests/t/func_weight_string.test
- tests/t/greedy_optimizer.test => tests/t/greedy_optimizer.test
- tests/t/group_by.test => tests/t/group_by.test
- tests/t/group_min_max_innodb.test => tests/t/group_min_max_innodb.test
- tests/t/having.test => tests/t/having.test
- tests/t/heap.test => tests/t/heap.test
- tests/t/heap_auto_increment.test => tests/t/heap_auto_increment.test
- tests/t/heap_btree.test => tests/t/heap_btree.test
- tests/t/heap_hash.test => tests/t/heap_hash.test
- tests/t/heap_var.test => tests/t/heap_var.test
- tests/t/information_schema.test => tests/t/information_schema.test
- tests/t/innodb-lock.test => tests/t/innodb-lock.test
- tests/t/innodb-semi-consistent.test => tests/t/innodb-semi-consistent.test
- tests/t/innodb_autoinc_lock_mode_zero.test => tests/t/innodb_autoinc_lock_mode_zero.test
- tests/t/innodb_mysql.test => tests/t/innodb_mysql.test
- tests/t/innodb_notembedded.test => tests/t/innodb_notembedded.test
- tests/t/innodb_timeout_rollback-master.opt => tests/t/innodb_timeout_rollback-master.opt
- tests/t/innodb_timeout_rollback.test => tests/t/innodb_timeout_rollback.test
- tests/t/innodb_trx_weight.test => tests/t/innodb_trx_weight.test
- tests/t/insert.test => tests/t/insert.test
- tests/t/insert_select.test => tests/t/insert_select.test
- tests/t/insert_update.test => tests/t/insert_update.test
- tests/t/join.test => tests/t/join.test
- tests/t/join_crash.test => tests/t/join_crash.test
- tests/t/join_nested.test => tests/t/join_nested.test
- tests/t/join_outer.test => tests/t/join_outer.test
- tests/t/join_outer_innodb.test => tests/t/join_outer_innodb.test
- tests/t/key.test => tests/t/key.test
- tests/t/key_diff.test => tests/t/key_diff.test
- tests/t/key_primary.test => tests/t/key_primary.test
- tests/t/keywords.test => tests/t/keywords.test
- tests/t/kill.test => tests/t/kill.test
- tests/t/limit.test => tests/t/limit.test
- tests/t/lock.test => tests/t/lock.test
- tests/t/lock_tables_lost_commit.test => tests/t/lock_tables_lost_commit.test
- tests/t/myisam-blob-master.opt => tests/t/myisam-blob-master.opt
- tests/t/myisam-blob.test => tests/t/myisam-blob.test
- tests/t/mysqldump-compat.opt => tests/t/mysqldump-compat.opt
- tests/t/mysqldump-compat.test => tests/t/mysqldump-compat.test
- tests/t/mysqldump-max.test => tests/t/mysqldump-max.test
- tests/t/order_by.test => tests/t/order_by.test
- tests/t/order_fill_sortbuf.test => tests/t/order_fill_sortbuf.test
- tests/t/overflow.test => tests/t/overflow.test
- tests/t/parser.test => tests/t/parser.test
- tests/t/parser_bug21114_innodb.test => tests/t/parser_bug21114_innodb.test
- tests/t/parser_precedence.test => tests/t/parser_precedence.test
- tests/t/pool_of_threads.test => tests/t/pool_of_threads.test
- tests/t/range.test => tests/t/range.test
- tests/t/replace.test => tests/t/replace.test
- tests/t/rollback.test => tests/t/rollback.test
- tests/t/round.test => tests/t/round.test
- tests/t/row.test => tests/t/row.test
- tests/t/rowid_order_innodb.test => tests/t/rowid_order_innodb.test
- tests/t/schema.test => tests/t/schema.test
- tests/t/select.test => tests/t/select.test
- tests/t/subselect.test => tests/t/subselect.test
- tests/t/subselect3.test => tests/t/subselect3.test
- tests/t/subselect_innodb.test => tests/t/subselect_innodb.test
- tests/t/sum_distinct.test => tests/t/sum_distinct.test
- tests/t/synchronization.test => tests/t/synchronization.test
- tests/t/tablelock.test => tests/t/tablelock.test
- tests/t/type_blob.test => tests/t/type_blob.test
- tests/t/type_date.test => tests/t/type_date.test
- tests/t/type_datetime.test => tests/t/type_datetime.test
- tests/t/type_float.test => tests/t/type_float.test
- tests/t/type_newdecimal.test => tests/t/type_newdecimal.test
- tests/t/type_ranges.test => tests/t/type_ranges.test
- tests/t/type_time.test => tests/t/type_time.test
- tests/t/type_timestamp.test => tests/t/type_timestamp.test
- tests/t/type_uint.test => tests/t/type_uint.test
- tests/t/type_varchar.test => tests/t/type_varchar.test
- tests/t/unsafe_binlog_innodb-master.opt => tests/t/unsafe_binlog_innodb-master.opt
- tests/t/unsafe_binlog_innodb.test => tests/t/unsafe_binlog_innodb.test
- tests/t/update.test => tests/t/update.test
- tests/t/variables-notembedded-master.opt => tests/t/variables-notembedded-master.opt
- tests/t/variables-notembedded.test => tests/t/variables-notembedded.test
- files modified:
- DRIZZLE.FAQ
added
removed
drizzled/lock.cc
