diff options
author | unknown <bell@sanja.is.com.ua> | 2005-06-21 20:44:18 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2005-06-21 20:44:18 +0300 |
commit | 8f011afe0344f3500b4cfce4ea34be6dd5c7a0bc (patch) | |
tree | 7b4bec13c8c3d534393a0d638293c96024f93eba /sql/item.cc | |
parent | 15e922f854fc3b78c7380aeb95481f830c247de2 (diff) | |
parent | 612de7c64346317f2427917beacc483e9d1e3b05 (diff) | |
download | mariadb-git-8f011afe0344f3500b4cfce4ea34be6dd5c7a0bc.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug4-5.0
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'sql/item.cc')
-rw-r--r-- | sql/item.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item.cc b/sql/item.cc index 8a7d00e2841..58033af14ae 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -314,6 +314,7 @@ void *Item::operator new(size_t size, Item *reuse, uint *rsize) Item::Item(): rsize(0), name(0), orig_name(0), name_length(0), fixed(0), + is_autogenerated_name(TRUE), collation(&my_charset_bin, DERIVATION_COERCIBLE) { marker= 0; |