diff options
author | bar@bar.mysql.r18.ru <> | 2003-03-03 10:53:08 +0400 |
---|---|---|
committer | bar@bar.mysql.r18.ru <> | 2003-03-03 10:53:08 +0400 |
commit | 48cdd978668dace6dd7a5de5ba5cb8bdc73cf1ae (patch) | |
tree | 27481e0ef5b2631746b621bdd86787e7f9b5afef /sql/item_subselect.cc | |
parent | b381cb042364dcb6cb475ebc9198329c6db59f3e (diff) | |
download | mariadb-git-48cdd978668dace6dd7a5de5ba5cb8bdc73cf1ae.tar.gz |
Strings which appear without charset context,
like number-to-string-convertion-result, now
takes current database character set, instead of
thread character set. This makes it easy to be
SQL99 conformant and 4.0 compatible.
Item->thd_charset() is renamed to Item->default_charset()
as old name doesn't describe its nature anymore.
Diffstat (limited to 'sql/item_subselect.cc')
-rw-r--r-- | sql/item_subselect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc index fb51b5561e9..a29cf57b4e1 100644 --- a/sql/item_subselect.cc +++ b/sql/item_subselect.cc @@ -372,7 +372,7 @@ String *Item_exists_subselect::val_str(String *str) reset(); return 0; } - str->set(value,thd_charset()); + str->set(value,default_charset()); return str; } @@ -415,7 +415,7 @@ String *Item_in_subselect::val_str(String *str) null_value= 1; return 0; } - str->set(value,thd_charset()); + str->set(value,default_charset()); return str; } |