diff options
| author | unknown <anozdrin/alik@ibm.opbmk> | 2007-06-20 12:46:15 +0400 |
|---|---|---|
| committer | unknown <anozdrin/alik@ibm.opbmk> | 2007-06-20 12:46:15 +0400 |
| commit | 08a6bebe71884b34a46c491476b57818cc953a55 (patch) | |
| tree | 16c299c76d624e9cf72cb36ccfb16d5f805d8d4c /sql/sql_error.cc | |
| parent | cb5f8fa50b3605f4d4e069330f2ede4eded60394 (diff) | |
| parent | c6d220e9fb3259f886749d78466517e1fcd1e99e (diff) | |
| download | mariadb-git-08a6bebe71884b34a46c491476b57818cc953a55.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
into ibm.opbmk:/home/alik/Documents/MySQL/devel/5.0-rt-build
sql/handler.cc:
Auto merged
sql/sql_error.cc:
Auto merged
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 a25c82c7721..344a0c00db8 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)); |