mariadb/storage/maria
Michael Widenius 22e793639a Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] [ID | USER user_name]
- If USER is given, all threads for that user is signaled
- If SOFT is used then the KILL will not be sent to the handler. This can be used to not interrupt critical things in the handler like 'REPAIR'.

Internally added more kill signals. This gives us more information of why a query/connection was killed.
- KILL_SERVER is used when server is going down. In this case the users gets ER_SHUTDOWN as the reason connection was killed.
- Changed signals to number in correct order, which makes it easier to test how the signal should affect the code.
- New error message ER_CONNECTION_KILLED if connection was killed by 'KILL CONNECTION'. Before we got error ER_SHUTDOWN.

Changed names of not used parameters KILL_QUERY & KILL_CONNCTION to mysql_kill() to not conflict with defines in the server


include/mysql.h.pp:
  Updated file
include/mysql_com.h:
  Changed names of not used parameters KILL_QUERY & KILL_CONNCTION to mysql_kill() to not conflict with defines in the server
mysql-test/r/kill.result:
  Added test of KILL USER
mysql-test/suite/rpl/r/rpl_stm_000001.result:
  Updated error code
mysql-test/suite/rpl/t/rpl_stm_000001.test:
  Updated error codes
mysql-test/t/flush_read_lock_kill.test:
  Updated error codes
mysql-test/t/kill.test:
  Added test of KILL USER
plugin/handler_socket/handlersocket/database.cpp:
  Removed THD:: from KILL
sql/debug_sync.cc:
  Removed THD:: from KILL
sql/event_scheduler.cc:
  Removed THD:: from KILL
sql/filesort.cc:
  Removed THD:: from KILL
sql/ha_ndbcluster_binlog.cc:
  Removed THD:: from KILL
sql/handler.cc:
  Removed THD:: from KILL
  Simplify code.
sql/lex.h:
  Added new keywords HARD | SOFT
sql/log.cc:
  Removed THD:: from KILL
  Added testing of new error ER_CONNECTION_KILLED
sql/log_event.cc:
  Removed THD:: from KILL
  Added testing of new error ER_CONNECTION_KILLED
sql/mysql_priv.h:
  Added new prototypes
sql/mysqld.cc:
  Removed THD:: from KILL
  Use KILL_SERVER_HARD signal on shutdown.
sql/scheduler.cc:
  Removed THD:: from KILL
  Simplify test if connection should be killed
sql/share/errmsg.txt:
  New error message ER_CONNECTION_KILLED
sql/slave.cc:
  Removed THD:: from KILL
sql/sp_head.cc:
  Removed THD:: from KILL
sql/sql_base.cc:
  Removed THD:: from KILL
sql/sql_cache.cc:
  Removed THD:: from KILL
sql/sql_class.cc:
  Removed THD:: from KILL
  Added killed_errno()
  Only signal kill to storage engine if HARD bit is set.
sql/sql_class.h:
  Move KILL options out from THD to make them easier to use in sql_yacc.yy
sql/sql_connect.cc:
  Removed THD:: from KILL
sql/sql_delete.cc:
  Removed THD:: from KILL
sql/sql_error.cc:
  Removed THD:: from KILL
sql/sql_insert.cc:
  Removed THD:: from KILL
  Simplifed testing if thread is killed.
sql/sql_lex.h:
  Added kill options to st_lex
sql/sql_load.cc:
  Removed THD:: from KILL
sql/sql_parse.cc:
  Added kill options to st_lex
  Simplifed and optimzed testing of thd->killed at end of query
  Added support for KILL USER
  Extended sql_kill() to allow use of more kill signals.
sql/sql_repl.cc:
  Removed THD:: from KILL
sql/sql_show.cc:
  Removed THD:: from KILL
  Simplied testing if query/connection was killed
sql/sql_table.cc:
  Removed THD:: from KILL
sql/sql_update.cc:
  Removed THD:: from KILL
sql/sql_yacc.yy:
  Added support for new KILL syntax: KILL [HARD|SOFT] [CONNECTION|QUERY] [ID | USER user_name]
storage/archive/ha_archive.cc:
  Simplify compilation
storage/maria/ha_maria.cc:
  Removed THD:: from KILL
2011-09-23 01:13:38 +03:00
..
unittest Merge with 5.1-microseconds 2011-05-28 05:11:32 +03:00
CMakeLists.txt Fixed build failures with maria3.test and widows build 2011-06-11 11:41:46 +03:00
file_formats.txt
ft_maria.c Fixed some compiler warnings and errors in test suite found by buildbot 2010-01-27 23:53:08 +02:00
ha_maria.cc Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] [ID | USER user_name] 2011-09-23 01:13:38 +03:00
ha_maria.h Merge with MariaDB 5.2 2011-05-10 18:17:43 +03:00
lockman.c Merge with 5.1-microseconds 2011-05-28 05:11:32 +03:00
lockman.h
ma_bitmap.c Fix compile warning 2011-09-16 18:14:19 +02:00
ma_blockrec.c Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload" 2011-08-15 16:39:53 +03:00
ma_blockrec.h Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload" 2011-08-15 16:39:53 +03:00
ma_cache.c - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing 2011-02-25 14:55:40 +02:00
ma_changed.c
ma_check.c Merge 5.2->5.3 2011-09-02 15:10:10 +03:00
ma_check_standalone.h Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table. 2011-07-01 15:08:30 +03:00
ma_checkpoint.c Merge 5.2->5.3 2011-09-02 15:10:10 +03:00
ma_checkpoint.h rename maria to aria 2010-09-12 18:40:01 +02:00
ma_checksum.c
ma_close.c Fixed portability problem with partiton_error.test 2011-06-13 12:46:11 +03:00
ma_commit.c
ma_commit.h
ma_control_file.c rename maria to aria 2010-09-12 18:40:01 +02:00
ma_control_file.h rename maria to aria 2010-09-12 18:40:01 +02:00
ma_create.c Automerge 5.2->5.3 2011-07-31 22:59:55 +02:00
ma_dbug.c Automatic merge with 5.1 2010-11-04 16:53:10 +02:00
ma_delete.c Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload" 2011-08-15 16:39:53 +03:00
ma_delete_all.c Fixes for Aria storage engine: 2011-02-10 20:33:51 +02:00
ma_delete_table.c Fixes for Aria storage engine: 2011-02-10 20:33:51 +02:00
ma_dynrec.c Aria fixes: 2011-07-04 04:32:53 +03:00
ma_extra.c Automatic merge with 5.2 2011-08-15 22:14:08 +03:00
ma_ft_boolean_search.c Merge with 5.2 (To get in fixes for Aria) 2011-01-11 19:01:03 +02:00
ma_ft_eval.c
ma_ft_eval.h
ma_ft_nlq_search.c Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle timeouts and kill of connections. 2010-07-16 10:33:01 +03:00
ma_ft_parser.c Applied Antony T Curtis patch for declaring many CHARSET objects as const 2010-01-06 21:20:16 +02:00
ma_ft_stem.c
ma_ft_test1.c
ma_ft_test1.h
ma_ft_update.c Merge with mysql-maria 2009-01-30 23:55:42 +02:00
ma_ftdefs.h Fixes after comments from last push: 2009-11-30 15:36:06 +02:00
ma_fulltext.h Merge with mysql-maria 2009-01-30 23:55:42 +02:00
ma_info.c
ma_init.c Merge with MariaDB 5.1 2011-05-03 19:10:10 +03:00
ma_key.c Merge with 5.2 2011-03-09 15:47:59 +02:00
ma_key_recover.c Merge with MySQL 5.1.55 2011-02-20 18:51:43 +02:00
ma_key_recover.h Fixes some bug in Aria recovery: 2010-10-07 12:51:34 +03:00
ma_keycache.c Aria issues: 2011-01-24 15:19:40 +02:00
ma_locking.c Aria fixes: 2011-07-04 04:32:53 +03:00
ma_loghandler.c Automerge 5.2->5.3 2011-07-31 22:59:55 +02:00
ma_loghandler.h Fix of compiler errors. 2011-05-16 16:13:34 +03:00
ma_loghandler_lsn.h
ma_norec.c Added support for NO_RECORD record format (don't store any row data) for Aria. 2011-01-14 11:54:39 +01:00
ma_open.c Automatic merge with 5.2 2011-08-15 22:14:08 +03:00
ma_packrec.c Use _ma_set_fatal_error() in Aria also for HA_ERR_WRONG_IN_RECORD, to be able to get an assert as soon as a failure is detected. 2011-01-26 15:29:36 +02:00
ma_page.c Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000: write_block_record: Assertion `cur_block[1].page_count == 0' failed with a multi-index Aria workload" 2011-08-15 16:39:53 +03:00
ma_pagecache.c Fixed bug lp:814054 'Assertion `block->hash_link == hash_link && hash_link->block == block' in ma_pagecache.c:2275 with Aria' 2011-08-10 22:44:39 +03:00
ma_pagecache.h Merge with 5.1 to get in changes from MySQL 5.1.55 2011-02-28 19:39:30 +02:00
ma_pagecaches.c
ma_pagecrc.c Fixes for Aria storage engine: 2011-02-10 20:33:51 +02:00
ma_panic.c Aria issues: 2011-01-24 15:19:40 +02:00
ma_preload.c
ma_range.c
ma_recovery.c Merge 5.2->5.3 2011-09-02 15:10:10 +03:00
ma_recovery.h Fixed portability problem with partiton_error.test 2011-06-13 12:46:11 +03:00
ma_recovery_util.c Aria issues: 2011-01-24 15:19:40 +02:00
ma_recovery_util.h
ma_rename.c
ma_rfirst.c
ma_rkey.c Merge with 5.2 2011-03-09 15:47:59 +02:00
ma_rlast.c
ma_rnext.c Merge in new handler and handlersocket code into 5.3 main 2011-02-22 11:15:47 +02:00
ma_rnext_same.c Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM locks as well as be unKILLable for long time" 2011-02-18 17:43:59 +02:00
ma_rprev.c Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM locks as well as be unKILLable for long time" 2011-02-18 17:43:59 +02:00
ma_rrnd.c
ma_rsame.c Fixed wrong test in maria_rsame() that caused ma_test_all to fail. 2011-01-11 13:27:16 +02:00
ma_rsamepos.c
ma_rt_index.c Safety fix for Aria: 2011-01-11 12:18:03 +02:00
ma_rt_index.h
ma_rt_key.c Fixes some bug in Aria recovery: 2010-10-07 12:51:34 +03:00
ma_rt_key.h
ma_rt_mbr.c
ma_rt_mbr.h
ma_rt_split.c When compiling with valgrind, change my_alloca() to use my_malloc() 2010-12-13 15:05:57 +02:00
ma_rt_test.c - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing 2011-02-25 14:55:40 +02:00
ma_scan.c
ma_search.c Merge with 5.2 2011-03-09 15:47:59 +02:00
ma_servicethread.c
ma_servicethread.h
ma_sort.c Added progress reporting for alter table, LOAD DATA INFILE and for aria tables: check table, repair table, analyze table. 2011-07-01 15:08:30 +03:00
ma_sp_defs.h
ma_sp_key.c
ma_sp_test.c
ma_state.c Fix for: LP #634955: Assert in _ma_update_at_original_place() 2010-11-02 17:22:57 +02:00
ma_state.h Fix for: LP #634955: Assert in _ma_update_at_original_place() 2010-11-02 17:22:57 +02:00
ma_static.c Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" 2011-04-28 18:02:26 +03:00
ma_statrec.c Use _ma_set_fatal_error() in Aria also for HA_ERR_WRONG_IN_RECORD, to be able to get an assert as soon as a failure is detected. 2011-01-26 15:29:36 +02:00
ma_test1.c Merge with 5.2 2011-03-09 15:47:59 +02:00
ma_test2.c - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testing 2011-02-25 14:55:40 +02:00
ma_test3.c Removed compiler warnings 2010-01-06 23:27:53 +02:00
ma_test_all.res
ma_test_all.sh
ma_test_big.sh
ma_test_force_start.pl rename maria to aria 2010-09-12 18:40:01 +02:00
ma_test_recovery
ma_unique.c Merge in new handler and handlersocket code into 5.3 main 2011-02-22 11:15:47 +02:00
ma_update.c Fixes for Aria storage engine: 2011-02-10 20:33:51 +02:00
ma_write.c Automatic merge with 5.2 2011-08-15 22:14:08 +03:00
Makefile.am Removed depricated --maria-options from mysqld. 2011-06-09 21:39:31 +03:00
maria_chk.c Automerge 5.2->5.3 2011-07-31 22:59:55 +02:00
maria_def.h Merge 5.2->5.3 2011-09-02 15:10:10 +03:00
maria_dump_log.c Merge MariaDB 5.1->5.2 2010-11-19 22:33:47 +01:00
maria_ftdump.c rename maria to aria 2010-09-12 18:40:01 +02:00
maria_pack.c Merge with 5.1-release. 2010-12-06 10:25:44 +02:00
maria_read_log.c Aria bug fixes and improvements: 2011-06-30 00:37:12 +03:00
maria_rename.sh
plug.in Merge MariaDB 5.1->5.2 2010-11-19 22:33:47 +01:00
tablockman.c Fix compile errors and warnings and test errors introduced by microseconds push. 2011-05-28 16:57:58 +02:00
tablockman.h
test_pack
trnman.c Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how often we should do a checkpoint. 2011-09-01 21:13:09 +03:00
trnman.h
trnman_public.h