diff options
| author | kostja@bodhi.(none) <> | 2007-07-02 01:55:01 +0400 |
|---|---|---|
| committer | kostja@bodhi.(none) <> | 2007-07-02 01:55:01 +0400 |
| commit | 7ce3cada4539b36ca9a710e9320df78e0348293c (patch) | |
| tree | 1be03e9cdd4e2c4239647349ec74da5bb1200ee6 /sql/sql_error.cc | |
| parent | 6a5ce49d09a22e1632dc70e010578ea402e452de (diff) | |
| parent | 2d8decabd42558776d9079aa36d48dcebee9ade3 (diff) | |
| download | mariadb-git-7ce3cada4539b36ca9a710e9320df78e0348293c.tar.gz | |
Merge bodhi.(none):/opt/local/work/mysql-5.0-runtime
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
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 61442c52de7..5ebeba6109a 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -126,7 +126,7 @@ MYSQL_ERROR *push_warning(THD *thd, MYSQL_ERROR::enum_warning_level level, sp_rcontext *spcont= thd->spcont; thd->no_warnings_for_error= 1; - thd->spcont= 0; + thd->spcont= NULL; thd->killed= THD::KILL_BAD_DATA; my_message(code, msg, MYF(0)); |