mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge paul@work.mysql.com:/home/bk/mysql-4.0

Browse source 
into teton.kitebird.com:/home/paul/mysql-4.0
This commit is contained in:
paul@teton.kitebird.com 2002-08-10 13:06:11 -05:00
commit 053211f6d3
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/r/func_str.result
View file

@ -148,7 +148,7 @@ decode(encode("abcdef","monty"),"monty")="abcdef"
1
select quote('\'\"\\test');
quote('\'\"\\test')
'\'\"\\test'
'\'"\\test'
select quote(concat('abc\'', '\\cba'));
quote(concat('abc\'', '\\cba'))
'abc\'\\cba'

12
sql/item_strfunc.cc
View file

@ -2071,13 +2071,15 @@ String* Item_func_inet_ntoa::val_str(String* str)
return str;
}
#define get_esc_bit(mask, num) (1 & (*((mask) + ((num) >> 3))) >> ((num) & 7))
/*
QUOTE() function returns argument string in single quotes,
also adds a \ before \, ' CHAR(0) and CHAR(24)
*/
String *Item_func_quote::val_str(String *str)
{
static char escmask[64] = {0x01, 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, 0x00,
static char escmask[32] = {0x01, 0x00, 0x00, 0x04, 0x80, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@ -2089,10 +2091,8 @@ String *Item_func_quote::val_str(String *str)
goto null;
for (from= (char*) arg->ptr(), end= from + arg->length(); from < end; from++)
{
if (*(escmask + (*from >> 3)) and (1 << (*from & 7)))
delta++;
}
delta+= get_esc_bit(escmask, *from);
if (str->alloc(arg->length() + delta))
goto null;
to= (char*) str->ptr() + arg->length() + delta - 1;
@ -2101,7 +2101,7 @@ String *Item_func_quote::val_str(String *str)
from--, to--)
{
*to= *from;
if (*(escmask + (*from >> 3)) and (1 << (*from & 7)))
if (get_esc_bit(escmask, *from))
*--to= '\\';
}
*to= '\'';