diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-12 19:56:29 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2011-11-12 19:56:29 +0400 |
| commit | 7c7269d3723a4044816b1f80424af0ff2bc56f3f (patch) | |
| tree | 877f14dd7dcbe276aa07dc26cbe63541bc893aff /sql/sql_error.cc | |
| parent | 45bb808c7ec0a77bb51038ff370753f8ed5c7ddf (diff) | |
| parent | db0aed93482759844af7b39c9bf6e7fe141f28f6 (diff) | |
| download | mariadb-git-7c7269d3723a4044816b1f80424af0ff2bc56f3f.tar.gz | |
merging.
Diffstat (limited to 'sql/sql_error.cc')
| -rw-r--r-- | sql/sql_error.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_error.cc b/sql/sql_error.cc index 835e60cd6ba..1db4a110d01 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -131,7 +131,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, thd->no_warnings_for_error= 1; thd->spcont= NULL; - thd->killed= THD::KILL_BAD_DATA; + thd->killed= KILL_BAD_DATA; my_message(code, msg, MYF(0)); thd->spcont= spcont; |