diff options
author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-01 17:58:44 +0300 |
---|---|---|
committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-01 17:58:44 +0300 |
commit | 8e13cd1a24b9006718a19760a4bd6eda3602a4eb (patch) | |
tree | 23f8a8d7c73914c208dd7c579681ea5b1b22534e /mysys | |
parent | 641d39a3bbfdf83c70d820a7d088404044253409 (diff) | |
parent | 181a29f20ac077aca69bee493eab946c6fb444f2 (diff) | |
download | mariadb-git-8e13cd1a24b9006718a19760a4bd6eda3602a4eb.tar.gz |
Automerge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'mysys')
-rw-r--r-- | mysys/my_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_sync.c b/mysys/my_sync.c index ba6964b00d6..97540f5eb48 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -103,11 +103,11 @@ static const char cur_dir_name[]= {FN_CURLIB, 0}; int my_sync_dir(const char *dir_name, myf my_flags) { #ifdef NEED_EXPLICIT_SYNC_DIR - DBUG_ENTER("my_sync_dir"); - DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags)); File dir_fd; int res= 0; const char *correct_dir_name; + DBUG_ENTER("my_sync_dir"); + DBUG_PRINT("my",("Dir: '%s' my_flags: %d", dir_name, my_flags)); /* Sometimes the path does not contain an explicit directory */ correct_dir_name= (dir_name[0] == 0) ? cur_dir_name : dir_name; /* |