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

Post merge fixes.

Browse Source 
mysql-test/r/sp.result:
  Enabled the cs test as it works now.
mysql-test/t/sp.test:
  Enabled the cs test as it works now.
This commit is contained in:
unknown
2003-04-04 15:47:43 +02:00
parent 2a25cf793f
commit cfd69393e4
7 changed files with 56 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sp.cc
View File

@@ -306,7 +306,11 @@ sp_add_fun_to_lex(LEX *lex, LEX_STRING fun)
while ((fn= li++))
{
if (my_strncasecmp(system_charset_info, fn, fun.str, fun.length) == 0)
uint len= strlen(fn);
if (my_strnncoll(system_charset_info,
(const uchar *)fn, len,
(const uchar *)fun.str, fun.length) == 0)
break;
}
if (! fn)
@@ -389,7 +393,12 @@ sp_find_cached_function(THD *thd, char *name, uint namelen)
while ((sp= li++))
{
if (my_strncasecmp(system_charset_info, name, sp->name(), namelen) == 0)
uint len;
const uchar *n= (const uchar *)sp->name(&len);
if (my_strnncoll(system_charset_info,
(const uchar *)name, namelen,
n, len) == 0)
break;
}
return sp;