diff options
| author | unknown <bar@bar.mysql.r18.ru> | 2002-10-25 13:59:08 +0500 |
|---|---|---|
| committer | unknown <bar@bar.mysql.r18.ru> | 2002-10-25 13:59:08 +0500 |
| commit | 0525cf47cb23a02cf6f29bceed0b3e3444a34055 (patch) | |
| tree | 82f1b98ed5c6345b48a4b775a8a4ff50d2999797 /sql/sql_class.cc | |
| parent | 347e9de041d5b275d1b612c75c11cb15d2092d28 (diff) | |
| parent | e8237515485b53bd0662e5fc5592bea5507594b8 (diff) | |
| download | mariadb-git-0525cf47cb23a02cf6f29bceed0b3e3444a34055.tar.gz | |
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1.wrk
sql/item_func.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index dab8d153c82..8de536d066d 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -896,7 +896,7 @@ bool select_singleval_subselect::send_data(List<Item> &items) { it->max_length= val_item->max_length; it->decimals= val_item->decimals; - it->binary= val_item->binary; + it->set_charset(val_item->charset()); it->int_value= val_item->val_int_result(); String *s= val_item->str_result(&it->string_value); if (s != &it->string_value) |