diff options
| author | unknown <bar@bar.myoffice.izhnet.ru> | 2007-10-24 10:49:46 +0500 |
|---|---|---|
| committer | unknown <bar@bar.myoffice.izhnet.ru> | 2007-10-24 10:49:46 +0500 |
| commit | 9be2220bfdc9fe67eef558f9bff764e912df7a9b (patch) | |
| tree | f6aa35c19f9376a046bae6703dc4a975d52b4263 /sql/sp_head.cc | |
| parent | fb9a562b1cc2b9048eff094bb7004fb3db0e7fd0 (diff) | |
| parent | e8b8b0894e547bd39c651ef497b52ebd1dd1bedf (diff) | |
| download | mariadb-git-9be2220bfdc9fe67eef558f9bff764e912df7a9b.tar.gz | |
Merge mysql.com:/home/bar/mysql-work/mysql-5.0
into mysql.com:/home/bar/mysql-work/mysql-5.0-rpl-mr
client/mysql.cc:
Auto merged
mysql-test/r/ctype_euckr.result:
Auto merged
mysql-test/r/ctype_uca.result:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
strings/ctype-euc_kr.c:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 69dda9ec1e8..5759d619e7e 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -100,8 +100,9 @@ sp_get_item_value(THD *thd, Item *item, String *str) case REAL_RESULT: case INT_RESULT: case DECIMAL_RESULT: - return item->val_str(str); - + if (item->field_type() != MYSQL_TYPE_BIT) + return item->val_str(str); + else {/* Bit type is handled as binary string */} case STRING_RESULT: { String *result= item->val_str(str); |