diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-08-30 21:26:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-08-30 21:26:43 -0400 |
| commit | 648f8a178f8bb56bbfccc6c9353342d33a623380 (patch) | |
| tree | 1b6df0fc2baa65c2deb776f98cf643647e393374 /storage | |
| parent | 87e68f20677aa507fcae97ed304526e9d886f919 (diff) | |
| parent | 85281ce80fc62f6f73428466b6377706b02e5f5f (diff) | |
| download | mariadb-git-648f8a178f8bb56bbfccc6c9353342d33a623380.tar.gz | |
Manual merge.
include/config-netware.h:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
sql/item_timefunc.cc:
Auto merged
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/os/os0file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/os/os0file.c b/storage/innobase/os/os0file.c index 6cd44a5ad08..3aebf20ac41 100644 --- a/storage/innobase/os/os0file.c +++ b/storage/innobase/os/os0file.c @@ -2613,7 +2613,7 @@ os_file_get_status( The function os_file_dirname returns a directory component of a null-terminated pathname string. In the usual case, dirname returns the string up to, but not including, the final '/', and basename -is the component following the final '/'. Trailing '/' charac +is the component following the final '/'. Trailing '/' charac ters are not counted as part of the pathname. If path does not contain a slash, dirname returns the string ".". |