diff options
author | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
---|---|---|
committer | Konstantin Osipov <kostja@sun.com> | 2010-06-17 17:31:51 +0400 |
commit | 484351d108b923038421b003f39770d3c96aeae0 (patch) | |
tree | 9413ba739bc0dbf1e647293756a3503f17dcde07 /sql/sql_delete.h | |
parent | db0ee68b38a3506e6d6e74a976f2e2b9a6fb1772 (diff) | |
parent | 71377f189fd9d6ac59d66773168cfd2bd75a052a (diff) | |
download | mariadb-git-484351d108b923038421b003f39770d3c96aeae0.tar.gz |
Merge trunk-bugfixing -> trunk-runtime
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 c718323ce1e..264991c220b 100644 --- a/sql/sql_delete.h +++ b/sql/sql_delete.h @@ -23,10 +23,10 @@ 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); #endif /* SQL_DELETE_INCLUDED */ |