Commit f6843329 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/wax/mysql/mysql-4.1 

into mysql.com:/home/wax/mysql/mysql-4.1test2
parents 5de67390 c83412f7

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1677,8 +1677,8 @@ then 
elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC -DUNIV_DEBUG $CXXFLAGS"

  CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"

  CXXFLAGS="$DEBUG_CXXFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

extra/perror.c

+12 −1
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ int main(int argc,char *argv[]) 
{

  int error,code,found;

  const char *msg;

  char *unknown_error = 0;

  MY_INIT(argv[0]);



  if (get_options(&argc,&argv))
@@ -212,7 +213,12 @@ int main(int argc,char *argv[]) 
      string 'Unknown Error'.  To avoid printing it we try to find the

      error string by asking for an impossible big error message.

    */

    const char *unknown_error= strerror(10000);

    msg = strerror(10000);



    /* allocate a buffer for unknown_error since strerror always returns the same pointer 

      on some platforms such as Windows */

    unknown_error = malloc( strlen(msg)+1 );

    strcpy( unknown_error, msg );



    for ( ; argc-- > 0 ; argv++)

    {
@@ -262,6 +268,11 @@ int main(int argc,char *argv[]) 
      }

    }

  }



  /* if we allocated a buffer for unknown_error, free it now */

  if (unknown_error)

	  free(unknown_error);



  exit(error);

  return error;

}

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 */