diff options
| author | unknown <kostja@bodhi.local> | 2006-07-15 01:04:51 +0400 |
|---|---|---|
| committer | unknown <kostja@bodhi.local> | 2006-07-15 01:04:51 +0400 |
| commit | 5677612aea6098001846c128dcefc357a013c171 (patch) | |
| tree | 06e46da942509b2dbfc21491adfe0fd8a3ec7db0 /sql/item.h | |
| parent | 906cd90d936e384af54c1f4e75ebb56bd2f6b148 (diff) | |
| parent | 4c2db1bef100a1159f65d3fad0ec764727198e58 (diff) | |
| download | mariadb-git-5677612aea6098001846c128dcefc357a013c171.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
mysql-test/r/func_sapdb.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/sp-vars.result:
Auto merged
mysql-test/t/func_sapdb.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/r/information_schema.result:
Use local
mysql-test/t/information_schema.test:
Manual merge.
sql/sql_lex.h:
Manual merge.
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 5494b885ff9..216a381af75 100644 --- a/sql/item.h +++ b/sql/item.h @@ -890,13 +890,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 /* |