database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fixed testcases and bug introduced by last changeset

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-07-01 17:59:42 +03:00
parent baf9baba2a
commit cd2de0a5eb
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_gconcat.result
View File

@ -169,7 +169,7 @@ select REQ_ID, Group_Concat(URL) as URL from T_URL, T_REQUEST where
T_REQUEST.URL_ID = T_URL.URL_ID group by REQ_ID; T_REQUEST.URL_ID = T_URL.URL_ID group by REQ_ID;
REQ_ID URL REQ_ID URL
1 www.host.com 1 www.host.com
5 www.host.com,www.google.com,www.help.com 5 www.google.com,www.help.com,www.host.com
drop table T_URL; drop table T_URL;
drop table T_REQUEST; drop table T_REQUEST;
select group_concat(sum(a)) from t1 group by grp; select group_concat(sum(a)) from t1 group by grp;

2
mysql-test/r/grant_cache.result
View File

@ -122,7 +122,7 @@ select "user4";
user4 user4
user4 user4
select a from t1; select a from t1;
ERROR 42000: No Database Selected ERROR 3D000: No Database Selected
select * from mysqltest.t1,test.t1; select * from mysqltest.t1,test.t1;
a b c a a b c a
1 1 1 test.t1 1 1 1 test.t1

9
mysys/mf_loadpath.c
View File

@ -28,6 +28,7 @@ my_string my_load_path(my_string to, const char *path,
const char *own_path_prefix) const char *own_path_prefix)
{ {
char buff[FN_REFLEN]; char buff[FN_REFLEN];
int is_cur;
DBUG_ENTER("my_load_path"); DBUG_ENTER("my_load_path");
DBUG_PRINT("enter",("path: %s prefix: %s",path, DBUG_PRINT("enter",("path: %s prefix: %s",path,
own_path_prefix ? own_path_prefix : "")); own_path_prefix ? own_path_prefix : ""));
@ -35,12 +36,14 @@ my_string my_load_path(my_string to, const char *path,
if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) || if ((path[0] == FN_HOMELIB && path[1] == FN_LIBCHAR) ||
test_if_hard_path(path)) test_if_hard_path(path))
VOID(strmov(buff,path)); VOID(strmov(buff,path));
else if ((path[0] == FN_CURLIB && path[1] == FN_LIBCHAR) || else if ((is_cur=(path[0] == FN_CURLIB && path[1] == FN_LIBCHAR)) ||
(is_prefix((gptr) path,FN_PARENTDIR)) || (is_prefix((gptr) path,FN_PARENTDIR)) ||
! own_path_prefix) ! own_path_prefix)
{ {
if (! my_getwd(buff,(uint) (FN_REFLEN+2-strlen(path)),MYF(0))) if (is_cur)
VOID(strcat(buff,path+2)); is_cur=2; /* Remove current dir */
if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0)))
VOID(strcat(buff,path+is_cur));
else else
VOID(strmov(buff,path)); /* Return org file name */ VOID(strmov(buff,path)); /* Return org file name */
} }