diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-06-10 22:30:49 -0300 |
| commit | db2fe44c844e969405095220287ea98a57f33284 (patch) | |
| tree | 7aee99151209c7e83d2cf2ec0b242e6827f8c55f /sql/sql_delete.h | |
| parent | 90343dd788471cbc384f7f11b7d48fc474ece4c5 (diff) | |
| parent | 0f9ddfa9d8bb8d071266bcc63e92813cf18ccd2b (diff) | |
| download | mariadb-git-db2fe44c844e969405095220287ea98a57f33284.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'sql/sql_delete.h')
| -rw-r--r-- | sql/sql_delete.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_delete.h b/sql/sql_delete.h index d1c1b363abd..0e09120f557 100644 --- a/sql/sql_delete.h +++ b/sql/sql_delete.h @@ -23,11 +23,11 @@ struct TABLE_LIST; class Item; typedef class Item COND; -typedef struct st_sql_list SQL_LIST; +template <typename T> class SQL_I_List; int mysql_prepare_delete(THD *thd, TABLE_LIST *table_list, Item **conds); bool mysql_delete(THD *thd, TABLE_LIST *table_list, COND *conds, - SQL_LIST *order, ha_rows rows, ulonglong options, + SQL_I_List<ORDER> *order, ha_rows rows, ulonglong options, bool reset_auto_increment); bool mysql_truncate(THD *thd, TABLE_LIST *table_list, bool dont_send_ok); |