diff options
| author | bell@sanja.is.com.ua <> | 2003-02-02 23:30:01 +0200 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2003-02-02 23:30:01 +0200 |
| commit | 62902a3b4bf46a386a9449b146c85523dc1b07c7 (patch) | |
| tree | b229dc72a1874a4a2e8c467d58a8a97d6cd597f4 /sql/sql_delete.cc | |
| parent | 291f8a225ac904eab5ce119c9a253bad21d8c7a4 (diff) | |
| download | mariadb-git-62902a3b4bf46a386a9449b146c85523dc1b07c7.tar.gz | |
after-review changes (577 SCRUM)
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 4b392e0904f..703eafd0af6 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -92,7 +92,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, if ((select && select->check_quick(safe_update, limit)) || !limit) { delete select; - free_ulderlayed_joins(thd, &thd->lex.select_lex); + free_underlaid_joins(thd, &thd->lex.select_lex); send_ok(thd,0L); DBUG_RETURN(0); // Nothing to delete } @@ -104,7 +104,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, if (safe_update && !using_limit) { delete select; - free_ulderlayed_joins(thd, &thd->lex.select_lex); + free_underlaid_joins(thd, &thd->lex.select_lex); send_error(thd,ER_UPDATE_WITHOUT_KEY_IN_SAFE_MODE); DBUG_RETURN(1); } @@ -134,7 +134,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, ORDER *order, == HA_POS_ERROR) { delete select; - free_ulderlayed_joins(thd, &thd->lex.select_lex); + free_underlaid_joins(thd, &thd->lex.select_lex); DBUG_RETURN(-1); // This will force out message } } @@ -210,7 +210,7 @@ cleanup: thd->lock=0; } delete select; - free_ulderlayed_joins(thd, &thd->lex.select_lex); + free_underlaid_joins(thd, &thd->lex.select_lex); if (error >= 0 || thd->net.report_error) send_error(thd,thd->killed ? ER_SERVER_SHUTDOWN: 0); else |