summaryrefslogtreecommitdiff
path: root/sql/item_sum.h
diff options
context:
space:
mode:
authormonty@narttu.mysql.fi <>2003-04-03 21:19:14 +0300
committermonty@narttu.mysql.fi <>2003-04-03 21:19:14 +0300
commit4a4838059fd109428eb90df27c4682b9d206cbb0 (patch)
treeb27e4cc9b07c5b7c391798dccc4673d37d45e6dd /sql/item_sum.h
parent22075460d8fee5fbf06f0c698a8eb84d5b3ec2be (diff)
downloadmariadb-git-4a4838059fd109428eb90df27c4682b9d206cbb0.tar.gz
Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT)
Diffstat (limited to 'sql/item_sum.h')
-rw-r--r--sql/item_sum.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h
index a6a6634b920..42d46876d27 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -631,12 +631,14 @@ public:
#endif /* HAVE_DLOPEN */
+class MYSQL_ERROR;
+
class Item_func_group_concat : public Item_sum
{
THD *item_thd;
TMP_TABLE_PARAM *tmp_table_param;
uint max_elements_in_tree;
- void *warning;
+ MYSQL_ERROR *warning;
bool warning_available;
public:
String result;