Commit fbdfcae6 authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1 

into sanja.is.com.ua:/home/bell/mysql/bk/work-bug_qc-4.1
parents b17793f5 c7ab92c2

Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ EXTRA_DIST = INSTALL-SOURCE README COPYING EXCEPTIONS-CLIENT 
SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \

			@readline_topdir@ sql-common \

			@thread_dirs@ pstack \

			@sql_union_dirs@ scripts man tests \

			@sql_union_dirs@ scripts @man_dirs@ tests \

			netware @libmysqld_dirs@ \

			@bench_dirs@ support-files @fs_dirs@ @tools_dirs@

VC++Files/sql/mysqld.dsp

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ LINK32=xilink6.exe 
# PROP Target_Dir ""

# ADD BASE CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "DBUG_OFF" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "USE_SYMDIR" /D "HAVE_DLOPEN" /D "NDEBUG" /FD /c

# SUBTRACT BASE CPP /YX

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENSE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt" /FD

# ADD CPP /nologo /G6 /MT /W3 /O2 /I "../include" /I "../regex" /I "../zlib" /D "__NT__" /D "DBUG_OFF" /D "HAVE_INNOBASE_DB" /D LICENSE=Commercial /D "NDEBUG" /D "MYSQL_SERVER" /D "_WINDOWS" /D "_CONSOLE" /D "_MBCS" /D "HAVE_DLOPEN" /D MYSQL_SERVER_SUFFIX=-pro-nt /FD

# ADD BASE RSC /l 0x409 /d "NDEBUG"

# ADD RSC /l 0x409 /d "NDEBUG"

BSC32=bscmake.exe

client/mysqltest.c

+5 −0
Original line number Diff line number Diff line
@@ -60,7 +60,12 @@ 
#include <sys/stat.h>

#include <violite.h>

#include <regex.h>                        /* Our own version of lib */

#ifdef HAVE_SYS_WAIT_H

#include <sys/wait.h>

#endif

#ifndef WEXITSTATUS

# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)

#endif

#define MAX_QUERY     131072

#define MAX_VAR_NAME	256

#define MAX_COLUMNS	256

configure.in

+6 −1
Original line number Diff line number Diff line
@@ -419,9 +419,14 @@ then 


  if echo $CXX | grep gcc > /dev/null 2>&1

  then

    if $CXX -v 2>&1 | grep 'version 3' > /dev/null 2>&1

    AC_MSG_CHECKING([if CXX is gcc 3 or 4])

    if $CXX -v 2>&1 | grep 'version [[34]]' > /dev/null 2>&1

    then

      AC_MSG_RESULT([yes])

      AC_MSG_NOTICE([using MySQL tricks to avoid linking C++ code with C++ libraries])

      CXXFLAGS="$CXXFLAGS -DUSE_MYSYS_NEW -DDEFINE_CXA_PURE_VIRTUAL"

    else

      AC_MSG_RESULT([no])

    fi

  fi

fi

innobase/fil/fil0fil.c

+11 −13
Original line number Diff line number Diff line
@@ -3400,9 +3400,9 @@ fil_extend_space_to_desired_size( 
	fil_space_t*	space;

	byte*		buf2;

	byte*		buf;

	ulint		buf_size;

	ulint		start_page_no;

	ulint		file_start_page_no;

	ulint		n_pages;

	ulint		offset_high;

	ulint		offset_low;

	ibool		success		= TRUE;
@@ -3427,22 +3427,20 @@ fil_extend_space_to_desired_size( 


	fil_node_prepare_for_io(node, system, space);



	/* Extend 1 MB at a time */

	start_page_no = space->size;

	file_start_page_no = space->size - node->size;



	buf2 = mem_alloc(1024 * 1024 + UNIV_PAGE_SIZE);

	/* Extend at most 64 pages at a time */

	buf_size = ut_min(64, size_after_extend - start_page_no)

				* UNIV_PAGE_SIZE;

	buf2 = mem_alloc(buf_size + UNIV_PAGE_SIZE);

	buf = ut_align(buf2, UNIV_PAGE_SIZE);



	memset(buf, '\0', 1024 * 1024);



	start_page_no = space->size;

	file_start_page_no = space->size - node->size;

	memset(buf, 0, buf_size);



	while (start_page_no < size_after_extend) {

		n_pages = size_after_extend - start_page_no;



		if (n_pages > (1024 * 1024) / UNIV_PAGE_SIZE) {

			n_pages = (1024 * 1024) / UNIV_PAGE_SIZE;

		}

		ulint	n_pages = ut_min(buf_size / UNIV_PAGE_SIZE,

				size_after_extend - start_page_no);



		offset_high = (start_page_no - file_start_page_no)

				/ (4096 * ((1024 * 1024) / UNIV_PAGE_SIZE));