diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-03 11:13:51 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-03 11:13:51 +0300 |
| commit | 8c8dffb60d23bf3a5666dcc251d2f15cb913d541 (patch) | |
| tree | c9f3e9d74cc127bb1de122f2c0d31fab4719caac /sql/table.h | |
| parent | a62a5fc9c0cef8d9f1ae685b43b6dc539d6fcfc8 (diff) | |
| download | mariadb-git-8c8dffb60d23bf3a5666dcc251d2f15cb913d541.tar.gz | |
fixed brocken of client_test
fixed aggregate functions in PS (BUG#3360)
mysql-test/r/union.result:
4.1 more correct error
sql/item_cmpfunc.h:
and_conds do not make fix fields
sql/item_sum.cc:
storing/restoring argument of aggregate function for prepared statements
restoring order list of group_concat for safety
sql/item_sum.h:
storing/restoring argument of aggregate function for prepared statements
layout fix
sql/mysql_priv.h:
just declaration
sql/sql_base.cc:
fix_fields() have to be called with temporary memory pool active
sql/sql_parse.cc:
removed hack with item pointer storing
sql/sql_prepare.cc:
debug output added
removed hack with item pointer storing
sql/sql_select.cc:
fix_fields now should be called separately
sql/sql_union.cc:
removed wrong merged check from 4.0 (4.1 have its own protection)
sql/table.h:
removed hack with item pointer storing
tests/client_test.c:
new test fo PS
Diffstat (limited to 'sql/table.h')
| -rw-r--r-- | sql/table.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/table.h b/sql/table.h index 039e3ded9f3..d128038d15a 100644 --- a/sql/table.h +++ b/sql/table.h @@ -26,6 +26,7 @@ class st_select_lex_unit; typedef struct st_order { struct st_order *next; Item **item; /* Point at item in select fields */ + Item *item_ptr; /* Storage for initial item */ bool asc; /* true if ascending */ bool free_me; /* true if item isn't shared */ bool in_field_list; /* true if in select field list */ |