diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-10-13 15:50:30 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-10-13 15:50:30 +0300 |
| commit | 3974119b5f1a735d4087105eb8c07f241a70f64b (patch) | |
| tree | 9b5d0d5098c97ae49c22be860572ba78e7471faa /sql/sql_delete.cc | |
| parent | 0cdddbf144de80d1c4da00ee681632bc0ac6c7c9 (diff) | |
| parent | 74ea459412f9a479ea1385a72cc27b4245c06435 (diff) | |
| download | mariadb-git-3974119b5f1a735d4087105eb8c07f241a70f64b.tar.gz | |
merge with 4.0 for more memory allocation variables.
configure.in:
Auto merged
mysql-test/r/variables.result:
Auto merged
mysql-test/t/variables.test:
Auto merged
sql/ha_berkeley.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_udf.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
scripts/Makefile.am:
merge
sql/log_event.cc:
merge
sql/mysqld.cc:
merge
sql/opt_range.cc:
merge
sql/set_var.cc:
merge
sql/sql_class.h:
merge
sql/sql_delete.cc:
merge
sql/sql_parse.cc:
merge
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 48ef5b4b74c..070d4cbbce9 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -89,7 +89,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, select=make_select(table,0,0,conds,&error); if (error) DBUG_RETURN(-1); - if ((select && select->check_quick(safe_update, limit)) || !limit) + if ((select && select->check_quick(thd, safe_update, limit)) || !limit) { delete select; free_underlaid_joins(thd, &thd->lex.select_lex); |