diff options
| author | pem@mysql.com <> | 2004-02-10 18:44:02 +0100 |
|---|---|---|
| committer | pem@mysql.com <> | 2004-02-10 18:44:02 +0100 |
| commit | c8585f3283816dea04c28774ef87537521b6aa80 (patch) | |
| tree | f04786f8a211a4c03eab547b7332792201289ac1 /sql/sql_delete.cc | |
| parent | 5344528b0034f0254d4c72b203c5888f1c8526c2 (diff) | |
| parent | 9de20058342fa7387071a3d70291a26db2e210c0 (diff) | |
| download | mariadb-git-c8585f3283816dea04c28774ef87537521b6aa80.tar.gz | |
Merge 4.1 into 5.0.
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 22cb11eed41..1fa216fdb58 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -43,7 +43,6 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, if ((open_and_lock_tables(thd, table_list))) DBUG_RETURN(-1); - fix_tables_pointers(thd->lex->all_selects_list); table= table_list->table; table->file->info(HA_STATUS_VARIABLE | HA_STATUS_NO_LOCK); thd->proc_info="init"; @@ -159,7 +158,7 @@ int mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, SQL_LIST *order, !thd->net.report_error) { // thd->net.report_error is tested to disallow delete row on error - if (!(select && select->skipp_record())&& !thd->net.report_error ) + if (!(select && select->skip_record())&& !thd->net.report_error ) { if (!(error=table->file->delete_row(table->record[0]))) { |