diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-15 17:27:55 +0200 |
| commit | d8ecbbe63471f958aa70443545b63d88d2db0230 (patch) | |
| tree | 32a6f432080d9125b3619f8935eb5b1de00e861d /mysys/my_sync.c | |
| parent | d121e6630519a66eec7c953ee0eae623f592ce87 (diff) | |
| parent | 6d69089845ed4c50df0ca8136a2cdacb8f2e1380 (diff) | |
| download | mariadb-git-d8ecbbe63471f958aa70443545b63d88d2db0230.tar.gz | |
Merge with MySQL 5.1.42
- Marked a couple of tests with --big
- Fixed xtradb/handler/ha_innodb.cc to call explain_filename()
storage/xtradb/handler/ha_innodb.cc:
Call explain_filename() to get proper names for partitioned tables
Diffstat (limited to 'mysys/my_sync.c')
| -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 f3503f29a95..f8961202fa3 100644 --- a/mysys/my_sync.c +++ b/mysys/my_sync.c @@ -104,11 +104,11 @@ int my_sync_dir(const char *dir_name __attribute__((unused)), myf my_flags __attribute__((unused))) { #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; /* |