diff options
| author | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-09 14:46:01 +0400 |
|---|---|---|
| committer | unknown <bar@bar.intranet.mysql.r18.ru> | 2006-11-09 14:46:01 +0400 |
| commit | d4f4301126ae534c1e55f241a993460a928a276e (patch) | |
| tree | 1bde7709168bdce785067d6a3c9d687de8732d30 /sql/item.cc | |
| parent | 69ac4dbaa13e5e6038bf60ba52ab334b19f632d5 (diff) | |
| parent | 7614eb0d1db4819ec6f1c3c59196d1dcb0d0c8d5 (diff) | |
| download | mariadb-git-d4f4301126ae534c1e55f241a993460a928a276e.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-5.0.b21505
into mysql.com:/usr/home/bar/mysql-5.1.b21505
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index f8a8b4a6272..6ab9a90ffe3 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -1655,7 +1655,7 @@ void Item_field::set_field(Field *field_par) db_name= field_par->table->s->db.str; alias_name_used= field_par->table->alias_name_used; unsigned_flag=test(field_par->flags & UNSIGNED_FLAG); - collation.set(field_par->charset(), DERIVATION_IMPLICIT); + collation.set(field_par->charset(), field_par->derivation()); fixed= 1; } |