diff options
| author | unknown <andrey@lmy004.> | 2006-05-29 20:23:44 +0200 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-05-29 20:23:44 +0200 |
| commit | e7515ef7cbd6b03c4aaa23d63f346cf76f052a0e (patch) | |
| tree | 5fda11bf96093215442eafc2ba59d2a382da440a /sql | |
| parent | f32d0ec6bfaad7a1512f283ae0f9c2e2f7b234e8 (diff) | |
| parent | 745a579d5d860b3cd4027eda48831d210a146384 (diff) | |
| download | mariadb-git-e7515ef7cbd6b03c4aaa23d63f346cf76f052a0e.tar.gz | |
Merge lmy004.:/work/mysql-5.1-new-vanilla
into lmy004.:/work/mysql-5.1-runtime
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 15 | ||||
| -rw-r--r-- | sql/sp_head.cc | 1 |
2 files changed, 15 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 2a8fe21f656..91828edec9c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -1024,7 +1024,20 @@ void kill_mysql(void) DBUG_VOID_RETURN; } - /* Force server down. kill all connections and threads and exit */ +/* + Force server down. Kill all connections and threads and exit + + SYNOPSIS + kill_server + + sig_ptr Signal number that caused kill_server to be called. + + NOTE! + A signal number of 0 mean that the function was not called + from a signal handler and there is thus no signal to block + or stop, we just want to kill the server. + +*/ #if defined(__NETWARE__) extern "C" void kill_server(int sig_ptr) diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 172cfbff532..c98394e3a05 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -250,6 +250,7 @@ sp_get_flags_for_command(LEX *lex) case SQLCOM_TRUNCATE: case SQLCOM_COMMIT: case SQLCOM_ROLLBACK: + case SQLCOM_LOAD: case SQLCOM_LOAD_MASTER_DATA: case SQLCOM_LOCK_TABLES: case SQLCOM_CREATE_PROCEDURE: |