diff options
| author | bar@mysql.com <> | 2005-03-04 14:20:49 +0400 |
|---|---|---|
| committer | bar@mysql.com <> | 2005-03-04 14:20:49 +0400 |
| commit | 7e8e033290b57d26fac64efcf98294b0258d1454 (patch) | |
| tree | 2441bab602265c2b1dba098f2faeade8b9cc33df /sql/item_create.cc | |
| parent | 0f3b5b7ccb8f8aa245413b20d84d8e617fa9f957 (diff) | |
| download | mariadb-git-7e8e033290b57d26fac64efcf98294b0258d1454.tar.gz | |
type_blob.result, func_system.result, func_str.result, ctype_collate.result:
fixing test results accordingly.
func_system.test:
New test that illegal mix of collations does not happen anymore.
item_strfunc.h:
safe_charset_converter() was added for system constants.
item_strfunc.cc:
safe_charset_converter() was added for system constants.
item_func.cc, item.h, item.cc:
Bug#8291: Illegal collation mix with USER() function.
After discussion with PeterG and Serge, a new coercibility
level for "system constants" was introduced, between
COERRIBLE and IMPLICIT. Thus:
SELECT col1 = USER() FROM t1; - is done according to col1 collation.
SELECT 'string' = USER(); - is done according to USER() collation.
At the same time, "nagg" and "strong" members were removed as unused.
item_create.cc:
Version is a system constant too.
Diffstat (limited to 'sql/item_create.cc')
| -rw-r--r-- | sql/item_create.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_create.cc b/sql/item_create.cc index d959a6f393a..c0361c928be 100644 --- a/sql/item_create.cc +++ b/sql/item_create.cc @@ -441,7 +441,7 @@ Item *create_func_version(void) { return new Item_string(NullS,server_version, (uint) strlen(server_version), - system_charset_info, DERIVATION_IMPLICIT); + system_charset_info, DERIVATION_SYSCONST); } Item *create_func_weekday(Item* a) |