diff options
| author | unknown <bar@mysql.com> | 2005-11-28 12:49:00 +0400 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-11-28 12:49:00 +0400 |
| commit | bb0edb8171ffa723ec028acfa31e9cbed4fea6c8 (patch) | |
| tree | d800e710b25a52b22876cb061c0bc86027ab8aee /sql/item.h | |
| parent | 84da27f67a99a4bbf1bc50712841f33dcb0a0458 (diff) | |
| parent | a9af48e9fc0b6bf91b272516dc8ec485b4faf7f3 (diff) | |
| download | mariadb-git-bb0edb8171ffa723ec028acfa31e9cbed4fea6c8.tar.gz | |
Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/usr/home/bar/mysql-5.0.param
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/item.h b/sql/item.h index 4201790e907..d41b8370911 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1084,7 +1084,11 @@ public: class Item_param :public Item { + char cnvbuf[MAX_FIELD_WIDTH]; + String cnvstr; + Item *cnvitem; public: + enum enum_item_param_state { NO_VALUE, NULL_VALUE, INT_VALUE, REAL_VALUE, |