Commit 6a3f93f4 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

InnoDB portability fixes

parent 1d7747aa

innobase/configure.in

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ AC_CHECK_HEADERS(aio.h sched.h) 
AC_CHECK_SIZEOF(int, 4)

AC_CHECK_FUNCS(sched_yield)

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_BIGENDIAN

innobase/os/os0file.c

+4 −0
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ os_file_pread( 
#ifdef HAVE_PREAD

	return(pread(file, buf, n, offs));

#else

	{

	ssize_t	ret;

	ulint	i;
@@ -624,6 +625,7 @@ os_file_pread( 
	os_mutex_exit(os_file_seek_mutexes[i]);



	return(ret);

	}

#endif

}
@@ -660,6 +662,7 @@ os_file_pwrite( 


        return(ret);

#else

	{

	ulint	i;



	/* Protect the seek / write operation with a mutex */
@@ -691,6 +694,7 @@ os_file_pwrite( 
	os_mutex_exit(os_file_seek_mutexes[i]);



	return(ret);

	}

#endif

}

#endif

mysql-test/r/innodb.result

+3 −3
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ Table Op Msg_type Msg_text 
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

t1	0	PRIMARY	1	id	A	2	NULL	NULL	

t1	1	parent_id	1	parent_id	A	4	NULL	NULL	

t1	1	level	1	level	A	4	NULL	NULL	

t1	1	parent_id	1	parent_id	A	2	NULL	NULL	

t1	1	level	1	level	A	2	NULL	NULL	

gesuchnr	benutzer_id

1	1

2	1
@@ -150,7 +150,7 @@ a b 
Table	Op	Msg_type	Msg_text

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

t1	1	skr	1	a	A	3	NULL	NULL	

t1	1	skr	1	a	A	1	NULL	NULL	

a	b

1	

n	after rollback