Commit d5ad4615 authored by unknown's avatar unknown
Browse files

Merge

parents d9adebfa 574a2820

BUILD/compile-dist

+1 −0
Original line number Diff line number Diff line
@@ -43,5 +43,6 @@ fi 
  --with-berkeley-db \

  --with-innodb \

  --enable-thread-safe-client \

  --with-extra-charsets=complex \

  --with-ndbcluster

make

include/my_pthread.h

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ extern int pthread_dummy(int); 
*/

#define DEFAULT_THREAD_STACK	(192*1024L)

#else

#define DEFAULT_THREAD_STACK	(192*1024L)

#define DEFAULT_THREAD_STACK	(192*1024)

#endif

#endif

innobase/os/os0file.c

+15 −1
Original line number Diff line number Diff line
@@ -1763,7 +1763,21 @@ os_file_flush( 
#else

	int	ret;



#ifdef HAVE_FDATASYNC

#ifdef HAVE_DARWIN_THREADS

	/* Apple has disabled fsync() for internal disk drives in OS X. That

	caused corruption for a user when he tested a power outage. Let us in

	OS X use a nonstandard flush method recommended by an Apple

	engineer. */



	ret = fcntl(file, F_FULLFSYNC, NULL);



	if (ret) {

		/* If we are not on a file system that supports this, then

		fall back to a plain fsync. */ 



		ret = fsync(file);

	}

#elif HAVE_FDATASYNC

	ret = fdatasync(file);

#else

/*	fprintf(stderr, "Flushing to file %p\n", file); */

sql/sql_parse.cc

+0 −1
Original line number Diff line number Diff line
@@ -2429,7 +2429,6 @@ mysql_execute_command(THD *thd) 
				       create_table_local);

    break;



create_error:

    res= 1; //error reported

unsent_create_error:

    // put tables back for PS rexecuting