Commit 5df7e7bd authored by unknown's avatar unknown
Browse files

Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1 

into hundin.mysql.fi:/home/heikki/mysql-4.1


sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
parents 0e2e3df2 47f15599

innobase/buf/buf0rea.c

+3 −1
Original line number Diff line number Diff line
@@ -679,7 +679,9 @@ buf_read_recv_pages( 
				fprintf(stderr,

"InnoDB: Error: InnoDB has waited for 50 seconds for pending\n"

"InnoDB: reads to the buffer pool to be finished.\n"

"InnoDB: Number of pending reads %lu\n", (ulong) buf_pool->n_pend_reads);

"InnoDB: Number of pending reads %lu, pending pread calls %lu\n",

				(ulong) buf_pool->n_pend_reads,

				(ulong)os_file_n_pending_preads);



				os_aio_print_debug = TRUE;

			}

innobase/fil/fil0fil.c

+2 −2
Original line number Diff line number Diff line
@@ -3002,8 +3002,8 @@ fil_load_single_table_tablespaces(void) 
				/* printf(

"     Looking at file %s\n", fileinfo.name); */



			        if (fileinfo.type == OS_FILE_TYPE_DIR

				    || dbinfo.type == OS_FILE_TYPE_UNKNOWN) {

			        if (fileinfo.type == OS_FILE_TYPE_DIR) {



				        goto next_file_item;

				}

innobase/os/os0file.c

+12 −11
Original line number Diff line number Diff line
@@ -700,12 +700,12 @@ dbname.sym can redirect a database directory: 
		} else if (lpFindFileData->dwFileAttributes

						& FILE_ATTRIBUTE_DIRECTORY) {

		        info->type = OS_FILE_TYPE_DIR;

		} else if (lpFindFileData->dwFileAttributes

						& FILE_ATTRIBUTE_NORMAL) {

/* TODO: are FILE_ATTRIBUTE_NORMAL files really all normal files? */	

			info->type = OS_FILE_TYPE_FILE;

		} else {

			info->type = OS_FILE_TYPE_UNKNOWN;

			/* It is probably safest to assume that all other

			file types are normal. Better to check them rather

			than blindly skip them. */



			info->type = OS_FILE_TYPE_FILE;

		}

	}
@@ -823,7 +823,7 @@ os_file_create_directory( 
    

	rcode = CreateDirectory(pathname, NULL);

	if (!(rcode != 0 ||

		   (GetLastError() == ERROR_FILE_EXISTS && !fail_if_exists))) {

	   (GetLastError() == ERROR_ALREADY_EXISTS && !fail_if_exists))) {

		/* failure */

		os_file_handle_error(pathname, "CreateDirectory");
@@ -907,8 +907,9 @@ os_file_create_simple( 


	file = CreateFile(name,

			access,

			FILE_SHARE_READ,/* file can be read also by other

					processes */

			FILE_SHARE_READ | FILE_SHARE_WRITE,

					/* file can be read ansd written also

					by other processes */

			NULL,	/* default security attributes */

			create_flag,

			attributes,
@@ -1013,7 +1014,7 @@ os_file_create_simple_no_error_handling( 
	DWORD		create_flag;

	DWORD		access;

	DWORD		attributes	= 0;

	DWORD		share_mode	= FILE_SHARE_READ;

	DWORD		share_mode	= FILE_SHARE_READ | FILE_SHARE_WRITE;

	

	ut_a(name);
@@ -1336,7 +1337,7 @@ os_file_delete_if_exists( 
		return(TRUE);

	}



	if (GetLastError() == ERROR_PATH_NOT_FOUND) {

	if (GetLastError() == ERROR_FILE_NOT_FOUND) {

		/* the file does not exist, this not an error */



		return(TRUE);
@@ -1397,7 +1398,7 @@ os_file_delete( 
		return(TRUE);

	}



	if (GetLastError() == ERROR_PATH_NOT_FOUND) {

	if (GetLastError() == ERROR_FILE_NOT_FOUND) {

		/* If the file does not exist, we classify this as a 'mild'

		error and return */

innobase/ut/ut0ut.c

+6 −6
Original line number Diff line number Diff line
@@ -44,13 +44,13 @@ ut_get_high32( 
			/* out: a >> 32 */

	ulint	a)	/* in: ulint */

{

#if SIZEOF_LONG == 4

	UT_NOT_USED(a);

	ib_longlong	i;



	return 0;

#else

	return(a >> 32);

#endif

	i = (ib_longlong)a;



	i = i >> 32;



	return((ulint)i);

}



/************************************************************

sql/mysqld.cc

+20 −1
Original line number Diff line number Diff line
@@ -4098,7 +4098,11 @@ enum options_mysqld 
  OPT_RANGE_ALLOC_BLOCK_SIZE,

  OPT_QUERY_ALLOC_BLOCK_SIZE, OPT_QUERY_PREALLOC_SIZE,

  OPT_TRANS_ALLOC_BLOCK_SIZE, OPT_TRANS_PREALLOC_SIZE,

  OPT_SYNC_FRM, OPT_SYNC_BINLOG, OPT_BDB_NOSYNC,

  OPT_SYNC_FRM, OPT_SYNC_BINLOG,

  OPT_SYNC_REPLICATION,

  OPT_SYNC_REPLICATION_SLAVE_ID,

  OPT_SYNC_REPLICATION_TIMEOUT,

  OPT_BDB_NOSYNC,

  OPT_ENABLE_SHARED_MEMORY,

  OPT_SHARED_MEMORY_BASE_NAME,

  OPT_OLD_PASSWORDS,
@@ -5211,6 +5215,21 @@ The minimum value for this variable is 4096.", 
   (gptr*) &sync_binlog_period,

   (gptr*) &sync_binlog_period, 0, GET_ULONG, REQUIRED_ARG, 0, 0, ~0L, 0, 1,

   0},

  {"sync-replication", OPT_SYNC_REPLICATION,

   "Enable synchronous replication",

   (gptr*) &global_system_variables.sync_replication,

   (gptr*) &global_system_variables.sync_replication,

   0, GET_ULONG, REQUIRED_ARG, 0, 0, 1, 0, 1, 0},

  {"sync-replication-slave-id", OPT_SYNC_REPLICATION_SLAVE_ID,

   "Synchronous replication is wished for this slave",

   (gptr*) &global_system_variables.sync_replication_slave_id,

   (gptr*) &global_system_variables.sync_replication_slave_id,

   0, GET_ULONG, REQUIRED_ARG, 0, 0, ~0L, 0, 1, 0},

  {"sync-replication-timeout", OPT_SYNC_REPLICATION_TIMEOUT,

   "Synchronous replication timeout",

   (gptr*) &global_system_variables.sync_replication_timeout,

   (gptr*) &global_system_variables.sync_replication_timeout,

   0, GET_ULONG, REQUIRED_ARG, 10, 0, ~0L, 0, 1, 0},

  {"sync-frm", OPT_SYNC_FRM, "Sync .frm to disk on create. Enabled by default",

   (gptr*) &opt_sync_frm, (gptr*) &opt_sync_frm, 0, GET_BOOL, NO_ARG, 1, 0,

   0, 0, 0, 0},