From 3814f2a8edf71a964cdbd8c965790d7216eff9fa Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 31 Mar 2003 13:39:46 +0500 Subject: SCRUM two KILL commands implementation (version 2) include/mysqld_error.h: Error message about query interruption added myisam/mi_check.c: killed_ptr now retutns only value - not pointer myisam/myisamchk.c: killed_ptr returns value now myisam/myisamdef.h: killed_ptr returns value now myisam/sort.c: killed_ptr returns value now sql/filesort.cc: THD::killed now has enum type sql/ha_berkeley.cc: THD::killed has enum type sql/ha_myisam.cc: killed_ptr returns value now sql/lock.cc: two different errors possible here now sql/log_event.cc: two ways of killing possible here now sql/mysqld.cc: THD::killed has enum type now sql/records.cc: two errors are possible here now sql/share/czech/errmsg.txt: new error message sql/share/danish/errmsg.txt: new error message sql/share/dutch/errmsg.txt: new error message sql/share/english/errmsg.txt: new error message sql/share/estonian/errmsg.txt: new error message sql/share/french/errmsg.txt: new error message sql/share/german/errmsg.txt: new error message sql/share/greek/errmsg.txt: new error message sql/share/hungarian/errmsg.txt: new error message sql/share/italian/errmsg.txt: new error message sql/share/japanese/errmsg.txt: new error message sql/share/korean/errmsg.txt: new error message sql/share/norwegian-ny/errmsg.txt: new error message sql/share/norwegian/errmsg.txt: new error message sql/share/polish/errmsg.txt: new error message sql/share/portuguese/errmsg.txt: new error message sql/share/romanian/errmsg.txt: new error message sql/share/russian/errmsg.txt: new error message sql/share/serbian/errmsg.txt: new error message sql/share/slovak/errmsg.txt: new error message sql/share/spanish/errmsg.txt: new error message sql/share/swedish/errmsg.txt: new error message sql/share/ukrainian/errmsg.txt: new error message sql/slave.cc: two errors are possible here now sql/sql_base.cc: THD::killed has enum type now sql/sql_cache.cc: THD::killed has enum type now sql/sql_class.cc: THD::awake implementation changed to handle KILL_QUERY sql/sql_class.h: class THD changed to handle KILL_QUERY sql/sql_delete.cc: two errors are possible here now sql/sql_insert.cc: THD::killed has enum type now sql/sql_load.cc: two errors are possible here now sql/sql_parse.cc: kill_one_thread function changed to handle KILL_QUERY sql/sql_prepare.cc: two errors are possible here now sql/sql_repl.cc: the parameter to awake is of THD::killed_state type now sql/sql_repl.h: awake parameter changed sql/sql_select.cc: two errors are possible here now sql/sql_show.cc: notification adopted to changes in class THD sql/sql_table.cc: two errors are possible here now sql/sql_update.cc: two errors are possible here now --- sql/slave.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index b06895b1779..787201841f7 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -543,7 +543,7 @@ int start_slave_thread(pthread_handler h_func, pthread_mutex_t *start_lock, if (thd->killed) { pthread_mutex_unlock(cond_lock); - DBUG_RETURN(ER_SERVER_SHUTDOWN); + DBUG_RETURN(thd->killed); } } } -- cgit v1.2.1 From 131d90001f2eca14d3497207b57fcd484c3f8927 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Apr 2003 19:18:33 +0500 Subject: SCRUM two KILL versions code trimming with headquarter's suggestions myisam/mi_check.c: killed_ptr function changed backward myisam/myisamchk.c: killed_ptr function changed backward myisam/myisamdef.h: killed_ptr function changed backward myisam/sort.c: killed_ptr function changed backward sql/ha_myisam.cc: killed_ptr function changed backward sql/lock.cc: error sending trimmed sql/log_event.cc: error sending trimmed sql/records.cc: error sending trimmed sql/slave.cc: error sending trimmed sql/sql_class.h: inline functions to send right message about killing added sql/sql_delete.cc: error sending trimmed sql/sql_load.cc: error sending trimmed sql/sql_parse.cc: error sending trimmed sql/sql_prepare.cc: error sending trimmed sql/sql_select.cc: error sending trimmed sql/sql_table.cc: error sending trimmed sql/sql_update.cc: error sending trimmed --- sql/slave.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index 78b415503f9..e6f7c5eac54 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -559,7 +559,7 @@ int start_slave_thread(pthread_handler h_func, pthread_mutex_t *start_lock, if (thd->killed) { pthread_mutex_unlock(cond_lock); - DBUG_RETURN(thd->killed); + DBUG_RETURN(thd->killed_errno()); } } } @@ -1861,7 +1861,7 @@ err: pthread_mutex_unlock(&data_lock); DBUG_PRINT("exit",("killed: %d abort: %d slave_running: %d \ improper_arguments: %d timed_out: %d", - (int) thd->killed, + thd->killed_errno(), (int) (init_abort_pos_wait != abort_pos_wait), (int) mi->slave_running, (int) (error == -2), -- cgit v1.2.1 From c560a02dcd1681ccb137580930b26de9414e55f3 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 May 2003 14:28:02 -0400 Subject: rlyon-5.0.0-alpha.patch client/mysql.cc: Import patch rlyon-5.0.0-alpha.patch configure.in: Import patch rlyon-5.0.0-alpha.patch include/config-netware.h: Import patch rlyon-5.0.0-alpha.patch include/my_global.h: Import patch rlyon-5.0.0-alpha.patch include/my_pthread.h: Import patch rlyon-5.0.0-alpha.patch mysys/my_pthread.c: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-AUTOTOOLS: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-linux-tools: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-netware-END: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-netware-START: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-netware-all: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-netware-debug: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-netware-standard: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/mwasmnlm: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/mwccnlm: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/mwenv: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/mwldnlm: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/nwbootstrap: Import patch rlyon-5.0.0-alpha.patch netware/Makefile.am: Import patch rlyon-5.0.0-alpha.patch netware/mysql_test_run.c: Import patch rlyon-5.0.0-alpha.patch scripts/make_binary_distribution.sh: Import patch rlyon-5.0.0-alpha.patch sql/mysqld.cc: Import patch rlyon-5.0.0-alpha.patch sql/slave.cc: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/compile-netware-src: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/cron-build: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/crontab: Import patch rlyon-5.0.0-alpha.patch netware/BUILD/knetware.imp: Import patch rlyon-5.0.0-alpha.patch --- sql/slave.cc | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sql/slave.cc') diff --git a/sql/slave.cc b/sql/slave.cc index 1c5ad681153..9e8fb90c066 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -2429,9 +2429,7 @@ err: goto slave_begin; #endif my_thread_end(); -#ifndef __NETWARE__ pthread_exit(0); -#endif /* __NETWARE__ */ DBUG_RETURN(0); // Can't return anything here } @@ -2573,9 +2571,7 @@ the slave SQL thread with \"SLAVE START\". We stopped at log \ goto slave_begin; #endif my_thread_end(); -#ifndef __NETWARE__ pthread_exit(0); -#endif /* __NETWARE__ */ DBUG_RETURN(0); // Can't return anything here } -- cgit v1.2.1