diff options
| author | gluh@mysql.com <> | 2006-06-14 10:54:56 +0500 |
|---|---|---|
| committer | gluh@mysql.com <> | 2006-06-14 10:54:56 +0500 |
| commit | a1020c6e4de4d65566d4c356b864d559787a6896 (patch) | |
| tree | 0514d0f3949422f7745fa055599bcf1f1b015c42 /sql/item_strfunc.h | |
| parent | 02c25f8055ea3829d9c92a00dd9f4e21b74702cd (diff) | |
| parent | 8acb6eeb80e9fd48f2eb075b76021d59432a0996 (diff) | |
| download | mariadb-git-a1020c6e4de4d65566d4c356b864d559787a6896.tar.gz | |
post-merge fix
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 35d8ac1873b..b2e63deed92 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -691,6 +691,7 @@ public: str->charset(), conv_charset, &errors)) null_value= 1; use_cached_value= 1; + str_value.mark_as_const(); safe= (errors == 0); } else |