1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

InnoDB portability fixes

Browse Source 
innobase/configure.in:
  Remove LOCALTIME_R (Already checked in config.h)
innobase/os/os0file.c:
  Fix syntax bug when using HAVE_PREAD/HAVE_PWRITE
mysql-test/r/innodb.result:
  Update results
This commit is contained in:
unknown 2001-10-11 12:49:44 +03:00
parent 1904897be7
commit 6f2d56162b
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
innobase/configure.in
View File

@ -38,7 +38,7 @@ AC_CHECK_HEADERS(aio.h sched.h)
AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(int, 4)
AC_CHECK_FUNCS(sched_yield) AC_CHECK_FUNCS(sched_yield)
AC_CHECK_FUNCS(fdatasync) AC_CHECK_FUNCS(fdatasync)
AC_CHECK_FUNCS(localtime_r) #AC_CHECK_FUNCS(localtime_r) # Already checked by MySQL
#AC_C_INLINE Already checked in MySQL #AC_C_INLINE Already checked in MySQL
AC_C_BIGENDIAN AC_C_BIGENDIAN

4
innobase/os/os0file.c
View File

@ -603,6 +603,7 @@ os_file_pread(
#ifdef HAVE_PREAD #ifdef HAVE_PREAD
return(pread(file, buf, n, offs)); return(pread(file, buf, n, offs));
#else #else
{
ssize_t ret; ssize_t ret;
ulint i; ulint i;
@ -624,6 +625,7 @@ os_file_pread(
os_mutex_exit(os_file_seek_mutexes[i]); os_mutex_exit(os_file_seek_mutexes[i]);
return(ret); return(ret);
}
#endif #endif
} }
@ -660,6 +662,7 @@ os_file_pwrite(
return(ret); return(ret);
#else #else
{
ulint i; ulint i;
/* Protect the seek / write operation with a mutex */ /* Protect the seek / write operation with a mutex */
@ -691,6 +694,7 @@ os_file_pwrite(
os_mutex_exit(os_file_seek_mutexes[i]); os_mutex_exit(os_file_seek_mutexes[i]);
return(ret); return(ret);
}
#endif #endif
} }
#endif #endif

6
mysql-test/r/innodb.result
View File

@ -134,8 +134,8 @@ Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support check/repair test.t1 optimize error The handler for the table doesn't support check/repair
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
t1 0 PRIMARY 1 id A 2 NULL NULL t1 0 PRIMARY 1 id A 2 NULL NULL
t1 1 parent_id 1 parent_id A 4 NULL NULL t1 1 parent_id 1 parent_id A 2 NULL NULL
t1 1 level 1 level A 4 NULL NULL t1 1 level 1 level A 2 NULL NULL
gesuchnr benutzer_id gesuchnr benutzer_id
1 1 1 1
2 1 2 1
@ -150,7 +150,7 @@ a b
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 analyze error The handler for the table doesn't support check/repair test.t1 analyze error The handler for the table doesn't support check/repair
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Comment
t1 1 skr 1 a A 3 NULL NULL t1 1 skr 1 a A 1 NULL NULL
a b a b
1 1
n after rollback n after rollback