diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-26 15:26:28 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2003-04-26 15:26:28 +0300 |
| commit | 0c94064bbddde8358b9308f0b0f2ce10e971a35a (patch) | |
| tree | 1d443ccbc69a259401b8fbbdce0a7e01e41f9db7 /sql/item.cc | |
| parent | 18a321adce6f07c62fae971bf022316cc649cfba (diff) | |
| parent | 68e1d7ad4219850e77b4d7979d8b6029bbabaed6 (diff) | |
| download | mariadb-git-0c94064bbddde8358b9308f0b0f2ce10e971a35a.tar.gz | |
merge fix
sql/handler.h:
Auto merged
sql/item.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.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 60d52e776fd..7dd8392b695 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -172,7 +172,7 @@ bool Item::get_time(TIME *ltime) CHARSET_INFO * Item::default_charset() const { - return current_thd->db_charset; + return current_thd->variables.collation_connection; } bool Item::set_charset(CHARSET_INFO *cs1, enum coercion co1, |