diff options
| author | unknown <gluh@mysql.com> | 2006-06-14 10:54:56 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2006-06-14 10:54:56 +0500 |
| commit | 5050b850d83dd9abd5f5b8dd7fbca9624da7e59f (patch) | |
| tree | 0514d0f3949422f7745fa055599bcf1f1b015c42 /sql/item_strfunc.h | |
| parent | 61abd6e8d29bcc9249660e76a05ac06b8ad867d7 (diff) | |
| parent | 1144c6ba197bd53c821e7019782303ff07223923 (diff) | |
| download | mariadb-git-5050b850d83dd9abd5f5b8dd7fbca9624da7e59f.tar.gz | |
post-merge fix
mysql-test/r/information_schema.result:
Auto merged
mysql-test/r/lowercase_table2.result:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_show.cc:
Auto merged
mysql-test/t/information_schema.test:
manual merge
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 |