summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-11-28 15:53:17 +0100
committerunknown <serg@serg.mylan>2004-11-28 15:53:17 +0100
commit30db8445c10b0ae44077f1b2739a3bb07b4735a4 (patch)
tree46d7ffed3e41aa68db463fe32568cb1f56dc23f2 /sql/sql_select.cc
parent7a1ffc062ecfafe9f1f7d4c15d7c8cc9815a7d3d (diff)
downloadmariadb-git-30db8445c10b0ae44077f1b2739a3bb07b4735a4.tar.gz
protection: TRASH in delete
fixed a bug that it discovered include/my_sys.h: move TRASH to my_sys.h from sql_list.h sql/field.h: use TRASH macro sql/item.h: TRASH in delete sql/item_func.h: never delete item's manually! sql/opt_range.cc: TRASH in delete sql/sql_lex.h: TRASH in delete sql/sql_list.h: move TRASH to my_sys.h from sql_list.h sql/sql_parse.cc: don't use properties of deleted objects (even when it's safe) sql/sql_select.cc: TRASH in delete sql/sql_show.cc: TRASH in delete sql/sql_string.h: TRASH in delete
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index d31305c5dd2..fb8e074ebf8 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -6025,9 +6025,13 @@ static void clear_tables(JOIN *join)
class COND_CMP :public ilink {
public:
- static void *operator new(size_t size) {return (void*) sql_alloc((uint) size); }
+ static void *operator new(size_t size)
+ {
+ return (void*) sql_alloc((uint) size);
+ }
static void operator delete(void *ptr __attribute__((unused)),
- size_t size __attribute__((unused))) {} /*lint -e715 */
+ size_t size __attribute__((unused)))
+ { TRASH(ptr, size); }
Item *and_level;
Item_func *cmp_func;