diff options
| author | unknown <ram@gw.mysql.r18.ru> | 2004-11-06 09:37:30 +0400 |
|---|---|---|
| committer | unknown <ram@gw.mysql.r18.ru> | 2004-11-06 09:37:30 +0400 |
| commit | 3f07afbea005900c185a769ea23381f1bba0ef23 (patch) | |
| tree | 324e143b46603ed4b13ab4f03ecb13557bb73a3a /sql/sql_udf.h | |
| parent | b38510ecd00abbfc99d7767d4b91c8d4d1cfbdc0 (diff) | |
| download | mariadb-git-3f07afbea005900c185a769ea23381f1bba0ef23.tar.gz | |
A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
sql/item_func.cc:
A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
Do nothing in the udf_handler destructor if not_original flag is set.
sql/item_sum.h:
A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
Set udf.not_original flag if we create an Item from the existent one.
sql/sql_udf.h:
A fix (bug #6441: Aggregate UDF in multi-table query crashes MySQL when returning multiple rows).
not_original flag added.
Diffstat (limited to 'sql/sql_udf.h')
| -rw-r--r-- | sql/sql_udf.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_udf.h b/sql/sql_udf.h index 7b10b80f148..d1f99a6d232 100644 --- a/sql/sql_udf.h +++ b/sql/sql_udf.h @@ -56,8 +56,9 @@ class udf_handler :public Sql_alloc public: table_map used_tables_cache; bool const_item_cache; + bool not_original; udf_handler(udf_func *udf_arg) :u_d(udf_arg), buffers(0), error(0), - is_null(0), initialized(0) + is_null(0), initialized(0), not_original(0) {} ~udf_handler(); const char *name() const { return u_d ? u_d->name.str : "?"; } |