diff options
| author | monty@mashka.mysql.fi <> | 2003-10-13 15:50:30 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-10-13 15:50:30 +0300 |
| commit | 461d1627b3323935345b13fe523f93dc74de9f36 (patch) | |
| tree | 9b5d0d5098c97ae49c22be860572ba78e7471faa /sql/sql_update.cc | |
| parent | c60a75e9ba08cd1937e73a42ca065b992a4f47d2 (diff) | |
| parent | c95d142f8f602b717c6c10d13e37b2b3ecf069d4 (diff) | |
| download | mariadb-git-461d1627b3323935345b13fe523f93dc74de9f36.tar.gz | |
merge with 4.0 for more memory allocation variables.
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index f2185d265e1..e14e20b62d6 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -152,7 +152,7 @@ int mysql_update(THD *thd, table->used_keys=0; select=make_select(table,0,0,conds,&error); if (error || - (select && select->check_quick(safe_update, limit)) || !limit) + (select && select->check_quick(thd, safe_update, limit)) || !limit) { delete select; free_underlaid_joins(thd, &thd->lex.select_lex); |