diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-05 15:34:19 +0300 |
| commit | ae64b6f7ab2ba58fd79ca8d808839ee41bf99f23 (patch) | |
| tree | 1f14300a8f95891aff71bf267d5b096d3f8b1ff6 /sql/item_cmpfunc.cc | |
| parent | aeeafbb39656fc4678c72b00f958215754b32dc7 (diff) | |
| parent | 7b3b8ae154da00cb35c067db62a2df57f0ea978f (diff) | |
| download | mariadb-git-ae64b6f7ab2ba58fd79ca8d808839ee41bf99f23.tar.gz | |
merge
Diffstat (limited to 'sql/item_cmpfunc.cc')
| -rw-r--r-- | sql/item_cmpfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 85565b735d4..c18b79371df 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -4617,7 +4617,7 @@ bool Item_func_like::fix_fields(THD *thd, Item **ref) return TRUE; } - if (escape_item->const_item()) + if (escape_item->const_item() && !thd->lex->view_prepare_mode) { /* If we are on execution stage */ String *escape_str= escape_item->val_str(&cmp.value1); |