mirror of
https://github.com/MariaDB/server.git
synced 2025-05-13 01:01:44 +03:00
b12e3796dc
- 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
70 lines
2.7 KiB
C
70 lines
2.7 KiB
C
|
|
/*
|
|
Errors a handler can give you
|
|
*/
|
|
|
|
static const char *handler_error_messages[]=
|
|
{
|
|
"Didn't find key on read or update",
|
|
"Duplicate key on write or update",
|
|
"Internal (unspecified) error in handler",
|
|
"Someone has changed the row since it was read (while the table was locked to prevent it)",
|
|
"Wrong index given to function",
|
|
"Undefined handler error 125",
|
|
"Index file is crashed",
|
|
"Record file is crashed",
|
|
"Out of memory in engine",
|
|
"Undefined handler error 129",
|
|
"Incorrect file format",
|
|
"Command not supported by database",
|
|
"Old database file",
|
|
"No record read before update",
|
|
"Record was already deleted (or record file crashed)",
|
|
"No more room in record file",
|
|
"No more room in index file",
|
|
"No more records (read after end of file)",
|
|
"Unsupported extension used for table",
|
|
"Too big row",
|
|
"Wrong create options",
|
|
"Duplicate unique key or constraint on write or update",
|
|
"Unknown character set used in table",
|
|
"Conflicting table definitions in sub-tables of MERGE table",
|
|
"Table is crashed and last repair failed",
|
|
"Table was marked as crashed and should be repaired",
|
|
"Lock timed out; Retry transaction",
|
|
"Lock table is full; Restart program with a larger lock table",
|
|
"Updates are not allowed under a read only transactions",
|
|
"Lock deadlock; Retry transaction",
|
|
"Foreign key constraint is incorrectly formed",
|
|
"Cannot add a child row",
|
|
"Cannot delete a parent row",
|
|
"No savepoint with that name",
|
|
"Non unique key block size",
|
|
"The table does not exist in engine",
|
|
"The table already existed in storage engine",
|
|
"Could not connect to storage engine",
|
|
"Unexpected null pointer found when using spatial index",
|
|
"The table changed in storage engine",
|
|
"There's no partition in table for the given value",
|
|
"Row-based binary logging of row failed",
|
|
"Index needed in foreign key constraint",
|
|
"Upholding foreign key constraints would lead to a duplicate key error in "
|
|
"some other table",
|
|
"Table needs to be upgraded before it can be used",
|
|
"Table is read only",
|
|
"Failed to get next auto increment value",
|
|
"Failed to set row auto increment value",
|
|
"Unknown (generic) error from engine",
|
|
"Record was not update. Original values was same as new values",
|
|
"It is not possible to log this statement",
|
|
"The event was corrupt, leading to illegal data being read",
|
|
"The table is of a new format not supported by this version",
|
|
"The event could not be processed. No other handler error happened",
|
|
"Got a fatal error during initialization of handler",
|
|
"File too short; Expected more data in file",
|
|
"Read page with wrong checksum",
|
|
"Too many active concurrent transactions",
|
|
"Row is not visible by the current transaction",
|
|
"Operation was interrupted by end user (probably kill command?)"
|
|
};
|