summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-03-02 15:06:27 +0200
committerunknown <monty@donna.mysql.fi>2001-03-02 15:06:27 +0200
commit3ab1788501f7d967a0260e78230674aaa67ec16e (patch)
tree4d9473c320617af263885de5aecf110702d61569 /sql
parent6bd98a63b9900604fd7aa1697f574bd9f3f2a80e (diff)
parentf05438e1566a4c159578d1e269c59de6d8689f6f (diff)
downloadmariadb-git-3ab1788501f7d967a0260e78230674aaa67ec16e.tar.gz
Merge work:/my/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_delete.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc
index bb8f8591577..707ff814716 100644
--- a/sql/sql_delete.cc
+++ b/sql/sql_delete.cc
@@ -156,6 +156,7 @@ int mysql_delete(THD *thd,TABLE_LIST *table_list,COND *conds,ha_rows limit,
limit != HA_POS_ERROR ? TL_WRITE_LOW_PRIORITY :
lock_type)))
DBUG_RETURN(-1);
+ table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK);
thd->proc_info="init";
if (use_generate_table)
DBUG_RETURN(generate_table(thd,table_list,table));