diff options
| author | unknown <anna@hasky.mysql.fi> | 2006-06-02 22:31:51 +0300 |
|---|---|---|
| committer | unknown <anna@hasky.mysql.fi> | 2006-06-02 22:31:51 +0300 |
| commit | a9a4202c9c34e8adf96f6f71ca4e885774b86232 (patch) | |
| tree | 5559454081305d161db89d28c1ecf96622161483 /mysys | |
| parent | 9b871930a9189cce16b39dc5576f3592a34959ba (diff) | |
| parent | 59a33015b461216c22fdf51585a53c9afecf9bfb (diff) | |
| download | mariadb-git-a9a4202c9c34e8adf96f6f71ca4e885774b86232.tar.gz | |
Merge anna@bk-internal.mysql.com:/home/bk/mysql-5.0
into hasky.mysql.fi:/home/anjuta/my/mysql-5.0-clean
sql/table.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_fn_ext.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_fn_ext.c b/mysys/mf_fn_ext.c index 9c86a8072ef..d7b1f8c1d61 100644 --- a/mysys/mf_fn_ext.c +++ b/mysys/mf_fn_ext.c @@ -40,14 +40,14 @@ my_string fn_ext(const char *name) DBUG_ENTER("fn_ext"); DBUG_PRINT("mfunkt",("name: '%s'",name)); -#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR) +#if defined(FN_DEVCHAR) || defined(FN_C_AFTER_DIR) || defined(BASKSLASH_MBTAIL) { char buff[FN_REFLEN]; gpos=(my_string) name+dirname_part(buff,(char*) name); } #else - if (!(gpos=strrchr(name,FNLIBCHAR))) - gpos=name; + if (!(gpos= strrchr(name, FN_LIBCHAR))) + gpos= (my_string) name; #endif pos=strchr(gpos,FN_EXTCHAR); DBUG_RETURN (pos ? pos : strend(gpos)); |