summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <anozdrin/alik@ibm.opbmk>2007-06-20 12:46:15 +0400
committerunknown <anozdrin/alik@ibm.opbmk>2007-06-20 12:46:15 +0400
commit08a6bebe71884b34a46c491476b57818cc953a55 (patch)
tree16c299c76d624e9cf72cb36ccfb16d5f805d8d4c /sql/handler.cc
parentcb5f8fa50b3605f4d4e069330f2ede4eded60394 (diff)
parentc6d220e9fb3259f886749d78466517e1fcd1e99e (diff)
downloadmariadb-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/handler.cc')
-rw-r--r--sql/handler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 37b81b58cfe..f8aec72ec90 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -1343,7 +1343,7 @@ int ha_delete_table(THD *thd, enum db_type table_type, const char *path,
strmake(buff, thd->net.last_error, sizeof(buff)-1);
thd->query_error= 0;
- thd->spcont= 0;
+ thd->spcont= NULL;
thd->lex->current_select= 0;
thd->net.last_error[0]= 0;