diff options
| author | unknown <brian@zim.(none)> | 2005-08-30 10:49:11 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-08-30 10:49:11 -0700 |
| commit | 172392f272b65ce630e3c56790ed76e666af3903 (patch) | |
| tree | 55867311c24915cd6461d324ceec28ea9f86bf0c /sql/sql_delete.cc | |
| parent | 9dd4438d00f606bd2a25016c68aaed40b8434bc5 (diff) | |
| parent | 5dd6e8776be709bbc04a332f450252383d2568d8 (diff) | |
| download | mariadb-git-172392f272b65ce630e3c56790ed76e666af3903.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1
into zim.(none):/home/brian/mysql/mysql-5.1
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 2967e2a8a20..5c339d7d64d 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -30,7 +30,7 @@ #include "sql_trigger.h" bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, - SQL_LIST *order, ha_rows limit, ulong options) + SQL_LIST *order, ha_rows limit, ulonglong options) { bool will_batch; int error, loc_error; @@ -309,6 +309,7 @@ bool mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds) DBUG_ENTER("mysql_prepare_delete"); if (setup_tables(thd, &thd->lex->select_lex.context, + &thd->lex->select_lex.top_join_list, table_list, conds, &select_lex->leaf_tables, FALSE) || setup_conds(thd, table_list, select_lex->leaf_tables, conds) || @@ -367,6 +368,7 @@ bool mysql_multi_delete_prepare(THD *thd) lex->query_tables also point on local list of DELETE SELECT_LEX */ if (setup_tables(thd, &thd->lex->select_lex.context, + &thd->lex->select_lex.top_join_list, lex->query_tables, &lex->select_lex.where, &lex->select_lex.leaf_tables, FALSE)) DBUG_RETURN(TRUE); @@ -415,9 +417,8 @@ bool mysql_multi_delete_prepare(THD *thd) } -multi_delete::multi_delete(THD *thd_arg, TABLE_LIST *dt, - uint num_of_tables_arg) - : delete_tables(dt), thd(thd_arg), deleted(0), found(0), +multi_delete::multi_delete(TABLE_LIST *dt, uint num_of_tables_arg) + : delete_tables(dt), deleted(0), found(0), num_of_tables(num_of_tables_arg), error(0), do_delete(0), transactional_tables(0), normal_tables(0) { @@ -826,7 +827,7 @@ bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok) ha_enable_transaction(thd, FALSE); mysql_init_select(thd->lex); error= mysql_delete(thd, table_list, (COND*) 0, (SQL_LIST*) 0, - HA_POS_ERROR, 0); + HA_POS_ERROR, LL(0)); ha_enable_transaction(thd, TRUE); thd->options= save_options; DBUG_RETURN(error); |