mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '5.5' into 10.0

Browse source
This commit is contained in:
Vicențiu Ciorbaru 2017-01-12 03:36:45 +02:00
commit 1c5ca7c183
15 changed files with 116 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/sys_vars.h
View file

@ -1235,7 +1235,7 @@ public:
if (var->value->result_type() == STRING_RESULT)
{
if (!(res=var->value->val_str(&str)))
if (!(res=var->value->val_str_ascii(&str)))
return true;
else
{