2675 Dmitry Lenev 2008-07-07
Fixed outdated comment describing mdl_init_lock() function.
modified:
sql/mdl.cc
2674 Konstantin Osipov 2008-07-04 [merge]
Merge 6.0 -> 6.0-runtime.
removed:
mysql-test/suite/falcon/r/falcon_bug_22182.result
mysql-test/suite/falcon/r/falcon_bug_26058.result
mysql-test/suite/falcon/r/falcon_bug_32413.result
mysql-test/suite/falcon/r/falcon_ts.result
mysql-test/suite/falcon/t/falcon_bug_22182.test
mysql-test/suite/falcon/t/falcon_bug_26058.test
mysql-test/suite/falcon/t/falcon_bug_32413.test
mysql-test/suite/falcon/t/falcon_ts.test
added:
mysql-test/extra/binlog_tests/implicit.test
mysql-test/suite/binlog/r/binlog_implicit_commit.result
mysql-test/suite/binlog/t/binlog_implicit_commit.test
mysql-test/suite/falcon/r/falcon_bug_31110.result
mysql-test/suite/falcon/r/falcon_bug_31114.result
mysql-test/suite/falcon/r/falcon_bug_31295.result
mysql-test/suite/falcon/r/falcon_bug_31311.result
mysql-test/suite/falcon/r/falcon_bug_32398.result
mysql-test/suite/falcon/r/falcon_bug_33212.result
mysql-test/suite/falcon/r/falcon_bug_33213.result
mysql-test/suite/falcon/r/falcon_bug_33397.result
mysql-test/suite/falcon/r/falcon_bug_33404.result
mysql-test/suite/falcon/r/falcon_bug_33723.result
mysql-test/suite/falcon/r/falcon_bug_34048.result
mysql-test/suite/falcon/r/falcon_bug_34617.result
mysql-test/suite/falcon/r/falcon_bug_37080.result
mysql-test/suite/falcon/r/rpl_falcon_bug_37221.result
mysql-test/suite/falcon/t/falcon_bug_31110.test
mysql-test/suite/falcon/t/falcon_bug_31114.test
mysql-test/suite/falcon/t/falcon_bug_31295.test
mysql-test/suite/falcon/t/falcon_bug_31311.test
mysql-test/suite/falcon/t/falcon_bug_32398.test
mysql-test/suite/falcon/t/falcon_bug_33212.test
mysql-test/suite/falcon/t/falcon_bug_33213.test
mysql-test/suite/falcon/t/falcon_bug_33397.test
mysql-test/suite/falcon/t/falcon_bug_33404.test
mysql-test/suite/falcon/t/falcon_bug_33723.test
mysql-test/suite/falcon/t/falcon_bug_34048.test
mysql-test/suite/falcon/t/falcon_bug_34617.test
mysql-test/suite/falcon/t/falcon_bug_37080.test
mysql-test/suite/falcon/t/rpl_falcon_bug_37221.test
mysql-test/suite/falcon_team/
mysql-test/suite/falcon_team/r/
mysql-test/suite/falcon_team/r/falcon_bug_31296.result
mysql-test/suite/falcon_team/r/falcon_bug_36294.result
mysql-test/suite/falcon_team/t/
mysql-test/suite/falcon_team/t/disabled.def
mysql-test/suite/falcon_team/t/falcon_bug_31296.test
mysql-test/suite/falcon_team/t/falcon_bug_36294.test
storage/falcon/Backup.cpp
storage/falcon/Backup.h
storage/falcon/IndexWalker.cpp
storage/falcon/IndexWalker.h
storage/falcon/SectorBuffer.cpp
storage/falcon/SectorBuffer.h
storage/falcon/SectorCache.cpp
storage/falcon/SectorCache.h
storage/falcon/WalkDeferred.cpp
storage/falcon/WalkDeferred.h
storage/falcon/WalkIndex.cpp
storage/falcon/WalkIndex.h
storage/myisammrg/scripts/
storage/myisammrg/scripts/mysql_config.pl
vio/CMakeFiles/
renamed:
mysql-test/suite/falcon/r/falcon_bug_22165.result => mysql-test/suite/falcon_team/r/falcon_bug_22165.result
mysql-test/suite/falcon/r/falcon_bug_22166.result => mysql-test/suite/falcon_team/r/falcon_bug_22166.result
mysql-test/suite/falcon/r/falcon_bug_22169.result => mysql-test/suite/falcon/r/falcon_bug_22169-big.result
mysql-test/suite/falcon/r/falcon_bug_22173.result => mysql-test/suite/falcon_team/r/falcon_bug_22173.result
mysql-test/suite/falcon/r/falcon_bug_22173a.result => mysql-test/suite/falcon_team/r/falcon_bug_22173a.result
mysql-test/suite/falcon/r/falcon_bug_22187.result => mysql-test/suite/falcon_team/r/falcon_bug_22187.result
mysql-test/suite/falcon/r/falcon_bug_22189.result => mysql-test/suite/falcon_team/r/falcon_bug_22189.result
mysql-test/suite/falcon/r/falcon_bug_22207.result => mysql-test/suite/falcon_team/r/falcon_bug_22207.result
mysql-test/suite/falcon/r/falcon_bug_23189.result => mysql-test/suite/falcon_team/r/falcon_bug_23189.result
mysql-test/suite/falcon/r/falcon_bug_23692.result => mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon/r/falcon_bug_23945.result => mysql-test/suite/falcon_team/r/falcon_bug_23945.result
mysql-test/suite/falcon/r/falcon_bug_23962.result => mysql-test/suite/falcon_team/r/falcon_bug_23962.result
mysql-test/suite/falcon/r/falcon_bug_24024.result => mysql-test/suite/falcon_team/r/falcon_bug_24024.result
mysql-test/suite/falcon/r/falcon_bug_26433.result => mysql-test/suite/falcon_team/r/falcon_bug_26433.result
mysql-test/suite/falcon/r/falcon_bug_27997.result => mysql-test/suite/falcon_team/r/falcon_bug_27997.result
mysql-test/suite/falcon/r/falcon_bug_28006.result => mysql-test/suite/falcon_team/r/falcon_bug_28006.result
mysql-test/suite/falcon/r/falcon_bug_29246.result => mysql-test/suite/falcon_team/r/falcon_bug_29246.result
mysql-test/suite/falcon/r/falcon_bug_30282.result => mysql-test/suite/falcon_team/r/falcon_bug_30282.result
mysql-test/suite/falcon/r/falcon_bug_30480_A.result => mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
mysql-test/suite/falcon/r/falcon_bug_30480_B.result => mysql-test/suite/falcon_team/r/falcon_bug_30480_B.result
mysql-test/suite/falcon/r/falcon_bug_30826.result => mysql-test/suite/falcon_team/r/falcon_bug_30826.result
mysql-test/suite/falcon/r/falcon_bug_34174.result => mysql-test/suite/falcon_team/r/falcon_bug_34174.result
mysql-test/suite/falcon/r/falcon_bug_34351_B.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_B.result
mysql-test/suite/falcon/r/falcon_bug_34351_C.result => mysql-test/suite/falcon_team/r/falcon_bug_34351_C.result
mysql-test/suite/falcon/r/falcon_bug_34892.result => mysql-test/suite/falcon_team/r/falcon_bug_34892.result
mysql-test/suite/falcon/r/falcon_deadlock.result => mysql-test/suite/falcon_team/r/falcon_deadlock.result
mysql-test/suite/falcon/r/falcon_read-committed.result => mysql-test/suite/falcon_team/r/falcon_read-committed.result
mysql-test/suite/falcon/r/ps_8falcon.result => mysql-test/suite/falcon_team/r/ps_8falcon.result
mysql-test/suite/falcon/r/read_many_rows_falcon.result => mysql-test/suite/falcon_team/r/read_many_rows_falcon.result
mysql-test/suite/falcon/t/falcon_bug_22165.test => mysql-test/suite/falcon_team/t/falcon_bug_22165.test
mysql-test/suite/falcon/t/falcon_bug_22166.test => mysql-test/suite/falcon_team/t/falcon_bug_22166.test
mysql-test/suite/falcon/t/falcon_bug_22169.test => mysql-test/suite/falcon/t/falcon_bug_22169-big.test
mysql-test/suite/falcon/t/falcon_bug_22173.test => mysql-test/suite/falcon_team/t/falcon_bug_22173.test
mysql-test/suite/falcon/t/falcon_bug_22173a.test => mysql-test/suite/falcon_team/t/falcon_bug_22173a.test
mysql-test/suite/falcon/t/falcon_bug_22187.test => mysql-test/suite/falcon_team/t/falcon_bug_22187.test
mysql-test/suite/falcon/t/falcon_bug_22189.test => mysql-test/suite/falcon_team/t/falcon_bug_22189.test
mysql-test/suite/falcon/t/falcon_bug_22207.test => mysql-test/suite/falcon_team/t/falcon_bug_22207.test
mysql-test/suite/falcon/t/falcon_bug_23189.test => mysql-test/suite/falcon_team/t/falcon_bug_23189.test
mysql-test/suite/falcon/t/falcon_bug_23692.test => mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon/t/falcon_bug_23945.test => mysql-test/suite/falcon_team/t/falcon_bug_23945.test
mysql-test/suite/falcon/t/falcon_bug_23962.test => mysql-test/suite/falcon_team/t/falcon_bug_23962.test
mysql-test/suite/falcon/t/falcon_bug_24024.test => mysql-test/suite/falcon_team/t/falcon_bug_24024.test
mysql-test/suite/falcon/t/falcon_bug_26433.test => mysql-test/suite/falcon_team/t/falcon_bug_26433.test
mysql-test/suite/falcon/t/falcon_bug_27997.test => mysql-test/suite/falcon_team/t/falcon_bug_27997.test
mysql-test/suite/falcon/t/falcon_bug_28006.test => mysql-test/suite/falcon_team/t/falcon_bug_28006.test
mysql-test/suite/falcon/t/falcon_bug_29246.test => mysql-test/suite/falcon_team/t/falcon_bug_29246.test
mysql-test/suite/falcon/t/falcon_bug_30282.test => mysql-test/suite/falcon_team/t/falcon_bug_30282.test
mysql-test/suite/falcon/t/falcon_bug_30480_A.test => mysql-test/suite/falcon_team/t/falcon_bug_30480_A.test
mysql-test/suite/falcon/t/falcon_bug_30480_B.test => mysql-test/suite/falcon_team/t/falcon_bug_30480_B.test
mysql-test/suite/falcon/t/falcon_bug_30826.test => mysql-test/suite/falcon_team/t/falcon_bug_30826.test
mysql-test/suite/falcon/t/falcon_bug_34174.test => mysql-test/suite/falcon_team/t/falcon_bug_34174.test
mysql-test/suite/falcon/t/falcon_bug_34351_B.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_B.test
mysql-test/suite/falcon/t/falcon_bug_34351_C.test => mysql-test/suite/falcon_team/t/falcon_bug_34351_C.test
mysql-test/suite/falcon/t/falcon_bug_34892.test => mysql-test/suite/falcon_team/t/falcon_bug_34892.test
mysql-test/suite/falcon/t/falcon_deadlock.test => mysql-test/suite/falcon_team/t/falcon_deadlock.test
mysql-test/suite/falcon/t/falcon_read-committed.test => mysql-test/suite/falcon_team/t/falcon_read-committed.test
mysql-test/suite/falcon/t/ps_8falcon.test => mysql-test/suite/falcon_team/t/ps_8falcon.test
mysql-test/suite/falcon/t/read_many_rows_falcon.test => mysql-test/suite/falcon_team/t/read_many_rows_falcon.test
mysql-test/suite/large_tests/r/falcon_bug_22150-big.result => mysql-test/suite/falcon/r/falcon_bug_22150-big.result
mysql-test/suite/large_tests/r/falcon_bug_22154.result => mysql-test/suite/falcon/r/falcon_bug_22154-big.result
mysql-test/suite/large_tests/r/falcon_record_cache_memory_leak-big.result => mysql-test/suite/falcon/r/falcon_record_cache_memory_leak-big.result
mysql-test/suite/large_tests/r/falcon_record_cache_memory_leak2-big.result => mysql-test/suite/falcon/r/falcon_record_cache_memory_leak2-big.result
mysql-test/suite/large_tests/t/falcon_bug_22150-big.test => mysql-test/suite/falcon/t/falcon_bug_22150-big.test
mysql-test/suite/large_tests/t/falcon_bug_22154.test => mysql-test/suite/falcon/t/falcon_bug_22154-big.test
mysql-test/suite/large_tests/t/falcon_record_cache_memory_leak-big.test => mysql-test/suite/falcon/t/falcon_record_cache_memory_leak-big.test
mysql-test/suite/large_tests/t/falcon_record_cache_memory_leak2-big.test => mysql-test/suite/falcon/t/falcon_record_cache_memory_leak2-big.test
modified:
.bzr-mysql/default.conf
CMakeLists.txt
client/mysqltest.c
configure.in
include/my_base.h
mysql-test/lib/mtr_cases.pl
mysql-test/mysql-test-run.pl
mysql-test/suite/falcon/r/falcon_bug_22183.result
mysql-test/suite/falcon/r/falcon_bug_26828.result
mysql-test/suite/falcon/r/falcon_bug_29511.result
mysql-test/suite/falcon/r/falcon_options.result
mysql-test/suite/falcon/r/falcon_options2.result
mysql-test/suite/falcon/r/falcon_select.result
mysql-test/suite/falcon/t/disabled.def
mysql-test/suite/falcon/t/falcon_bug.template
mysql-test/suite/falcon/t/falcon_bug_22183.test
mysql-test/suite/falcon/t/falcon_bug_26828.test
mysql-test/suite/falcon/t/falcon_bug_29511.test
mysql-test/suite/falcon/t/falcon_bug_30031.test
mysql-test/suite/falcon/t/falcon_options.test
mysql-test/suite/falcon/t/falcon_select.test
mysql-test/suite/funcs_1/datadict/charset_collation.inc
mysql-test/suite/funcs_1/t/charset_collation_1.test
mysql-test/suite/funcs_1/t/charset_collation_3.test
mysql-test/suite/funcs_1/t/disabled.def
mysql-test/suite/rpl_ndb_big/r/rpl_ndb_dd_partitions.result
mysys/my_handler_errors.h
sql/field.cc
sql/field.h
sql/ha_partition.cc
sql/handler.cc
sql/handler.h
sql/partition_info.cc
sql/set_var.cc
sql/share/errmsg.txt
sql/sql_bitmap.h
sql/sql_select.cc
sql/sql_tablespace.cc
sql/table.cc
storage/falcon/AsciiBlob.cpp
storage/falcon/BDB.cpp
storage/falcon/BDB.h
storage/falcon/BinaryBlob.cpp
storage/falcon/Bitmap.cpp
storage/falcon/BlobReference.cpp
storage/falcon/BlobReference.h
storage/falcon/CMakeLists.txt
storage/falcon/Cache.cpp
storage/falcon/Cache.h
storage/falcon/Configuration.cpp
storage/falcon/DataOverflowPage.cpp
storage/falcon/DataOverflowPage.h
storage/falcon/DataPage.cpp
storage/falcon/DataPage.h
storage/falcon/Database.cpp
storage/falcon/Database.h
storage/falcon/DateTime.cpp
storage/falcon/Decompress.cpp
storage/falcon/DeferredIndex.h
storage/falcon/DeferredIndexWalker.cpp
storage/falcon/DeferredIndexWalker.h
storage/falcon/EncodedDataStream.cpp
storage/falcon/EncodedDataStream.h
storage/falcon/Engine.h
storage/falcon/Error.cpp
storage/falcon/Error.h
storage/falcon/Event.cpp
storage/falcon/Format.cpp
storage/falcon/Format.h
storage/falcon/Gopher.cpp
storage/falcon/Hdr.cpp
storage/falcon/Hdr.h
storage/falcon/IO.cpp
storage/falcon/Index.cpp
storage/falcon/Index.h
storage/falcon/IndexPage.cpp
storage/falcon/IndexPage.h
storage/falcon/IndexRootPage.cpp
storage/falcon/IndexRootPage.h
storage/falcon/Interlock.h
storage/falcon/InversionPage.cpp
storage/falcon/InversionPage.h
storage/falcon/License.cpp
storage/falcon/Makefile.am
storage/falcon/MemMgr.cpp
storage/falcon/Page.h
storage/falcon/PageInventoryPage.cpp
storage/falcon/PageInventoryPage.h
storage/falcon/PageWriter.cpp
storage/falcon/PriorityScheduler.cpp
storage/falcon/Protocol.cpp
storage/falcon/Record.cpp
storage/falcon/Record.h
storage/falcon/RecordLeaf.cpp
storage/falcon/RecordLocatorPage.cpp
storage/falcon/RecordLocatorPage.h
storage/falcon/RecordScavenge.cpp
storage/falcon/RecordScavenge.h
storage/falcon/RecordVersion.cpp
storage/falcon/RecordVersion.h
storage/falcon/SQLError.cpp
storage/falcon/SQLException.h
storage/falcon/SRLDropTable.cpp
storage/falcon/SRLDropTableSpace.cpp
storage/falcon/Section.cpp
storage/falcon/SectionPage.cpp
storage/falcon/SectionPage.h
storage/falcon/SerialLog.cpp
storage/falcon/SerialLog.h
storage/falcon/SerialLogFile.cpp
storage/falcon/SerialLogFile.h
storage/falcon/SerialLogTransaction.cpp
storage/falcon/SerialLogTransaction.h
storage/falcon/Socket.cpp
storage/falcon/Socket.h
storage/falcon/StorageDatabase.cpp
storage/falcon/StorageDatabase.h
storage/falcon/StorageHandler.cpp
storage/falcon/StorageParameters.h
storage/falcon/StorageTable.cpp
storage/falcon/StorageTable.h
storage/falcon/StorageTableShare.cpp
storage/falcon/StorageTableShare.h
storage/falcon/StorageVersion.h
storage/falcon/Stream.cpp
storage/falcon/Stream.h
storage/falcon/StreamSegment.cpp
storage/falcon/SymbolManager.cpp
storage/falcon/SyncObject.cpp
storage/falcon/SyncObject.h
storage/falcon/SyncTest.cpp
storage/falcon/SyncTest.h
storage/falcon/Synchronize.cpp
storage/falcon/Synchronize.h
storage/falcon/Table.cpp
storage/falcon/Table.h
storage/falcon/TableSpaceManager.cpp
storage/falcon/TableSpaceManager.h
storage/falcon/Thread.cpp
storage/falcon/Thread.h
storage/falcon/TimeStamp.cpp
storage/falcon/TimeStamp.h
storage/falcon/Transaction.cpp
storage/falcon/Transaction.h
storage/falcon/TransactionManager.cpp
storage/falcon/TransactionManager.h
storage/falcon/TransformLib/Makefile.am
storage/falcon/Types.h
storage/falcon/Value.cpp
storage/falcon/ha_falcon.cpp
storage/falcon/ha_falcon.h
storage/falcon/plug.in
strings/my_vsnprintf.c
mysql-test/suite/falcon/r/falcon_bug_22169-big.result
mysql-test/suite/falcon_team/r/falcon_bug_22189.result
mysql-test/suite/falcon_team/r/falcon_bug_23692.result
mysql-test/suite/falcon_team/r/falcon_bug_30480_A.result
mysql-test/suite/falcon_team/r/ps_8falcon.result
mysql-test/suite/falcon/t/falcon_bug_22169-big.test
mysql-test/suite/falcon_team/t/falcon_bug_22189.test
mysql-test/suite/falcon_team/t/falcon_bug_23692.test
mysql-test/suite/falcon_team/t/falcon_bug_27997.test
mysql-test/suite/falcon_team/t/falcon_bug_30826.test
mysql-test/suite/falcon/r/falcon_bug_22150-big.result
mysql-test/suite/falcon/t/falcon_bug_22150-big.test
=== modified file 'sql/mdl.cc'
--- a/sql/mdl.cc 2008-06-20 13:11:20 +0000
+++ b/sql/mdl.cc 2008-07-07 15:51:20 +0000
@@ -245,8 +245,9 @@ void mdl_context_merge(MDL_CONTEXT *dst,
@param lock_data Pointer to an MDL_LOCK_DATA object to initialize
@param key_buff Pointer to the buffer for key for the lock request
- (should be at least strlen(db) + strlen(name)
- + 2 bytes, or, if the lengths are not known, MAX_DBNAME_LENGTH)
+ (should be at least 4+ strlen(db) + 1 + strlen(name)
+ + 1 bytes, or, if the lengths are not known,
+ MAX_MDLKEY_LENGTH)
@param type Id of type of object to be locked
@param db Name of database to which the object belongs
@param name Name of of the object
| Thread |
|---|
| • bzr push into mysql-6.0 branch (dlenev:2674 to 2675) | Dmitry Lenev | 7 Jul |
