diff options
| author | jimw@mysql.com <> | 2005-07-19 16:32:38 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-07-19 16:32:38 -0700 |
| commit | 63c6ece7286204d412d988308a54c7b8bd750831 (patch) | |
| tree | a4e8ace7736a07b964138a8bd862465dceb15235 /sql | |
| parent | 80c1c6b33f27d37d9bf4e7bba103e10377da5c01 (diff) | |
| download | mariadb-git-63c6ece7286204d412d988308a54c7b8bd750831.tar.gz | |
Cleanups after merge from 4.1.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/field_conv.cc | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index c46e1c08c8b..fc7347ef9af 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -339,7 +339,7 @@ static void do_cut_string(Copy_field *copy) MY_SEQ_SPACES) < copy->from_length - copy->to_length) { copy->to_field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_DATA_TRUNCATED, 1); + WARN_DATA_TRUNCATED, 1); } } diff --git a/sql/mysqld.cc b/sql/mysqld.cc index ec0cb3851d6..0f4ed88140d 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -692,7 +692,7 @@ static void close_connections(void) { DBUG_PRINT("quit",("Informing thread %ld that it's time to die", tmp->thread_id)); - tmp->killed= 1; + tmp->killed= THD::KILL_CONNECTION; if (tmp->mysys_var) { tmp->mysys_var->abort=1; |