diff options
| author | unknown <konstantin@mysql.com> | 2006-07-01 22:13:42 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-07-01 22:13:42 +0400 |
| commit | 4c2db1bef100a1159f65d3fad0ec764727198e58 (patch) | |
| tree | d95c3da90bd35eba6d137fa33a19459f9bdaf82f /sql/item.h | |
| parent | 047e2be28c9a4a51c2c0348f970f78bed6c601af (diff) | |
| parent | 697e8d71bbc0859694a320f3ac18e8053e183794 (diff) | |
| download | mariadb-git-4c2db1bef100a1159f65d3fad0ec764727198e58.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-runtime
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/item.h')
| -rw-r--r-- | sql/item.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/sql/item.h b/sql/item.h index 534d20b3aec..2190ce78374 100644 --- a/sql/item.h +++ b/sql/item.h @@ -827,13 +827,6 @@ protected: public: LEX_STRING m_name; - /* - Buffer, pointing to the string value of the item. We need it to - protect internal buffer from changes. See comment to analogous - member in Item_param for more details. - */ - String str_value_ptr; - public: #ifndef DBUG_OFF /* |