database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge

Browse Source
This commit is contained in:
Georgi Kodinov
2010-08-05 15:34:19 +03:00
parent aeeafbb396 7b3b8ae154
commit ae64b6f7ab
17 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/item_cmpfunc.cc
View File

@@ -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);