diff options
| author | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:14 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2003-04-03 21:19:14 +0300 |
| commit | 0dbfff461472b3dd308713102b0abce3b5d4d0c4 (patch) | |
| tree | b27e4cc9b07c5b7c391798dccc4673d37d45e6dd /sql/item_sum.h | |
| parent | c9d2e7759a97c7f32cc28182a171b5ae84622d8f (diff) | |
| download | mariadb-git-0dbfff461472b3dd308713102b0abce3b5d4d0c4.tar.gz | |
Fixed bug in warning handling (Memory was allocated from wrong MEM_ROOT)
sql/item_sum.cc:
Fixed bug in warning handling.
sql/item_sum.h:
Fixed bug in warning handling.
sql/sql_class.h:
Fixed bug in warning handling.
sql/sql_error.cc:
Fixed bug in warning handling.
strings/my_vsnprintf.c:
After merge fix
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 4 |
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; |