diff options
| author | unknown <konstantin@mysql.com> | 2004-06-18 04:16:08 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2004-06-18 04:16:08 +0400 |
| commit | cbfe9f05174eefc4fe2dcf97c4ca32d2087c32db (patch) | |
| tree | fd77ab1ae1671618423ee4d87147610ae243d693 /sql/item.h | |
| parent | 25749c968604adc68a00055abb73e6d8ec3d5505 (diff) | |
| download | mariadb-git-cbfe9f05174eefc4fe2dcf97c4ca32d2087c32db.tar.gz | |
Fix for bug#4105 "Server crash on attempt to prepare a statement with
character set introducer": add new item type to be returned before from
Item_param until it's value is set.
This way items like Item_bool_func2 and udf_handler won't treat this item
as constant literal when statement is prepared.
mysql-test/r/ps.result:
Test results fixed (test case for bug #4105)
mysql-test/t/ps.test:
Followup to bug #4105: a test case.
sql/item.cc:
Fix for bug#4105 "Server crash on attempt to prepare a statement with
character set introducer": add new item type to be returned before from
Item_param until it's value is set.
sql/item.h:
Fix for bug#4105 "Server crash on attempt to prepare a statement with
character set introducer": add new item type to be returned before from
Item_param until it's value is set.
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item.h b/sql/item.h index 3cb1d6e2aa4..52a44a65526 100644 --- a/sql/item.h +++ b/sql/item.h @@ -98,7 +98,8 @@ public: COPY_STR_ITEM, FIELD_AVG_ITEM, DEFAULT_VALUE_ITEM, PROC_ITEM,COND_ITEM, REF_ITEM, FIELD_STD_ITEM, FIELD_VARIANCE_ITEM, INSERT_VALUE_ITEM, - SUBSELECT_ITEM, ROW_ITEM, CACHE_ITEM, TYPE_HOLDER}; + SUBSELECT_ITEM, ROW_ITEM, CACHE_ITEM, TYPE_HOLDER, + PARAM_ITEM}; enum cond_result { COND_UNDEF,COND_OK,COND_TRUE,COND_FALSE }; |