• Michael Widenius's avatar
    Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM... · b12e3796
    Michael Widenius authored
    Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM locks as well as be unKILLable for long time"
    - In Maria/MyISAM: Release/re-acquire locks to give queries that wait on them a chance to make progress
    - In Maria/MyISAM: Change from numeric constants to ICP_RES values.
    - In Maria: Do check index condition in maria_rprev() (was lost in the merge/backport?)
    - In Maria/MyISAM/XtraDB: Check if the query was killed, and return immediately if it was.
    
    Added new storage engine error: HA_ERR_ABORTED_BY_USER, for handler to signal that it detected a kill of the query and aborted
    
    Authors: Sergey Petrunia & Monty
    
    include/my_base.h:
      Added HA_ERR_ABORTED_BY_USER, for handler to signal that it detected a kill of the query and aborted
    include/my_handler.h:
      Added comment
    mysql-test/r/myisam_icp.result:
      Updated test
    mysql-test/t/myisam_icp.test:
      Drop used tables at start of test
      Added test case that can help with manual testing of killing index condition pushdown query.
    mysys/my_handler_errors.h:
      Text for new storage engine error
    sql/handler.cc:
      If engine got HA_ERR_ABORTED_BY_USER, send kill message.
    sql/multi_range_read.cc:
      Return error code
    storage/maria/ha_maria.cc:
      Added ma_killed_in_mariadb() to detect kill.
      Ensure that file->external_ref points to TABLE object.
    storage/maria/ma_extra.c:
      Dummy test-if-killed for standalone
    storage/maria/ma_key.c:
      If ma_check_index_cond() fails, set my_errno and info->cur_row.lastpos
    storage/maria/ma_rkey.c:
      Release/re-acquire locks to give queries that wait on them a chance to make progress
      Check if the query was killed, and return immediately if it was
    storage/maria/ma_rnext.c:
      Check if the query was killed, and return immediately if it was
      Added missing fast_ma_writeinfo(info)
    storage/maria/ma_rnext_same.c:
      Check if the query was killed, and return immediately if it was
      Added missing fast_ma_writeinfo(info)
    storage/maria/ma_rprev.c:
      Check if the query was killed, and return immediately if it was
      Added missing fast_ma_writeinfo(info) and ma_check_index_cond()
    storage/maria/ma_search.c:
      Give error message if we find a wrong key
    storage/maria/ma_static.c:
      Added pointer to test-if-killed function
    storage/maria/maria_def.h:
      New prototypes
    storage/myisam/ha_myisam.cc:
      Added mi_killed_in_mariadb()
      Ensure that file->external_ref points to TABLE object.
    storage/myisam/mi_extra.c:
      Dummy test-if-killed for standalone
    storage/myisam/mi_key.c:
      If ma_check_index_cond() fails, set my_errno and info->lastpos
    storage/myisam/mi_rkey.c:
      Ensure that info->lastpos= HA_OFFSET_ERROR in case of error
      Release/re-acquire locks to give queries that wait on them a chance to make progress
      Check if the query was killed, and return immediately if it was
      Reorder code to do less things in case of error.
      Added missing fast_mi_writeinfo()
    storage/myisam/mi_rnext.c:
      Check if the query was killed, and return immediately if it was
      Simplify old ICP code
      Added missing fast_ma_writeinfo(info)
    storage/myisam/mi_rnext_same.c:
      Check if the query was killed, and return immediately if it was
      Added missing fast_mi_writeinfo(info)
    storage/myisam/mi_rprev.c:
      Check if the query was killed, and return immediately if it was
      Simplify error handling of ICP
      Added missing fast_mi_writeinfo(info)
    storage/myisam/mi_search.c:
      Give error message if we find a wrong key
    storage/myisam/mi_static.c:
      Added pointer to test-if-killed function
    storage/myisam/myisamdef.h:
      New prototypes
    storage/xtradb/handler/ha_innodb.cc:
      Added DB_SEARCH_ABORTED_BY_USER and ha_innobase::is_thd_killed()
      Check if the query was killed, and return immediately if it was
    storage/xtradb/handler/ha_innodb.h:
      Added prototype
    storage/xtradb/include/db0err.h:
      Added DB_SEARCH_ABORTED_BY_USER
    storage/xtradb/include/row0mysql.h:
      Added possible ICP errors
    storage/xtradb/row/row0sel.c:
      Use ICP errors instead of constants.
      Detect if killed and return B_SEARCH_ABORTED_BY_USER
    b12e3796
mi_rnext_same.c 3.73 KB