diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-20 18:40:07 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-20 18:40:07 +0200 |
| commit | 1055cf967f02104a169ca6ec87033dc64ea882b1 (patch) | |
| tree | d2c41028d22c48fb925837bdc78af979c3cbd691 /mysys | |
| parent | e8113f7572ef7eab45b7b696429101690caeeed4 (diff) | |
| parent | e7ddf46632db84f55af85cd4f401d59c6ab29242 (diff) | |
| download | mariadb-git-1055cf967f02104a169ca6ec87033dc64ea882b1.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_seek.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/my_seek.c b/mysys/my_seek.c index 6a370b0ad43..db364ccddda 100644 --- a/mysys/my_seek.c +++ b/mysys/my_seek.c @@ -86,7 +86,7 @@ my_off_t my_tell(File fd, myf MyFlags) DBUG_ENTER("my_tell"); DBUG_PRINT("my",("fd: %d MyFlags: %lu",fd, MyFlags)); DBUG_ASSERT(fd >= 0); -#if defined (HAVE_TELL) && !defined (_WIN32) +#if defined (HAVE_TELL) && !defined (_WIN32) && !defined(_AIX) pos= tell(fd); #else pos= my_seek(fd, 0L, MY_SEEK_CUR,0); |