diff options
| author | unknown <monty@hundin.mysql.fi> | 2002-05-16 18:20:49 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2002-05-16 18:20:49 +0300 |
| commit | 08fed6b775e1f8ab2211cb5d44a2ca840b271df1 (patch) | |
| tree | 12de711f3f9d8ad9eee9d28cf71e5487f17315d3 /sql/sql_db.cc | |
| parent | 40292dd14c5ed2a538f08eb8d1ec23bcd906b570 (diff) | |
| parent | 167eb02c8020386cfd063391b74777fc0b4a44ad (diff) | |
| download | mariadb-git-08fed6b775e1f8ab2211cb5d44a2ca840b271df1.tar.gz | |
merge with 3.23.51
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-mysql_fix_extensions.sh:
Delete: scripts/mysql_fix_extensions.sh
Build-tools/Do-rpm:
Auto merged
Makefile.am:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
extra/resolve_stack_dump.c:
Auto merged
include/my_pthread.h:
Auto merged
include/my_sys.h:
Auto merged
include/mysqld_error.h:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
isam/pack_isam.c:
Auto merged
libmysql/libmysql.c:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/t/join.test:
Auto merged
mysys/array.c:
Auto merged
mysys/charset.c:
Auto merged
mysys/default.c:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_thr_init.c:
Auto merged
mysys/raid.cc:
Auto merged
mysql-test/t/type_decimal.test:
Auto merged
sql/hostname.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log.cc:
Auto merged
sql/mini_client.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/Makefile.am:
Auto merged
Diffstat (limited to 'sql/sql_db.cc')
| -rw-r--r-- | sql/sql_db.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_db.cc b/sql/sql_db.cc index 9198cb4ba82..07e7c5e6680 100644 --- a/sql/sql_db.cc +++ b/sql/sql_db.cc @@ -310,6 +310,7 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db, #endif /* Remove last FN_LIBCHAR to not cause a problem on OS/2 */ pos=strend(path); + if (pos > path && pos[-1] == FN_LIBCHAR) *--pos=0; /* Don't give errors if we can't delete 'RAID' directory */ |