• Konstantin Osipov's avatar
    A fix and a test case for · cb0cca86
    Konstantin Osipov authored
    Bug#41756 "Strange error messages about locks from InnoDB".
          
    In JT_EQ_REF (join_read_key()) access method, 
    don't try to unlock rows in the handler, unless certain that 
    a) they were locked
    b) they are not used.
    
    Unlocking of rows is done by the logic of the nested join loop,
    and is unaware of the possible caching that the access method may
    have. This could lead to double unlocking, when a row
    was unlocked first after reading into the cache, and then 
    when taken from cache, as well as to unlocking of rows which
    were actually used (but taken from cache).
          
    Delegate part of the unlocking logic to the access method,
    and in JT_EQ_REF count how many times a record was actually 
    used in the join. Unlock it only if it's usage count is 0.
    
    Implemented review comments.
    
    mysql-test/r/innodb_lock_wait_timeout_1.result:
      Update results (Bug41756).
    mysql-test/t/innodb_lock_wait_timeout_1.test:
      Add a test case (Bug#41756).
    sql/item_subselect.cc:
      Complete struct READ_RECORD initialization with a new
      member to unlock records.
    sql/records.cc:
      Extend READ_RECORD API with a method to unlock read records.
    sql/sql_select.cc:
      In JT_EQ_REF (join_read_key()) access method, 
      don't try to unlock rows in the handler, unless certain that 
      a) they were locked
      b) they are not used.
    sql/sql_select.h:
      Add members to TABLE_REF to count TABLE_REF buffer usage count.
    sql/structs.h:
      Update declarations.
    cb0cca86
sql_select.h 25.4 KB