Commit 0b7ca5e8 authored by unknown's avatar unknown
Browse files

Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.0 

into hundin.mysql.fi:/home/marko/k/mysql-4.0
parents 360d32f2 bde9e860

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -1632,12 +1632,12 @@ if test "$with_debug" = "yes" 
then

  # Medium debug.

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

  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"

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

elif test "$with_debug" = "full"

then

  # Full debug. Very slow in some cases

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

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

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

else

  # Optimized version. No debug

  CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS"

innobase/include/srv0srv.h

+3 −1
Original line number Diff line number Diff line
@@ -27,7 +27,8 @@ extern os_event_t srv_lock_timeout_thread_event; 


/* If the last data file is auto-extended, we add this many pages to it

at a time */

#define SRV_AUTO_EXTEND_INCREMENT   (8 * ((1024 * 1024) / UNIV_PAGE_SIZE))

#define SRV_AUTO_EXTEND_INCREMENT	\

	(srv_auto_extend_increment * ((1024 * 1024) / UNIV_PAGE_SIZE))



/* This is set to TRUE if the MySQL user has set it in MySQL */

extern ibool	srv_lower_case_table_names;
@@ -49,6 +50,7 @@ extern ulint* srv_data_file_is_raw_partition; 


extern ibool	srv_auto_extend_last_data_file;

extern ulint	srv_last_file_size_max;

extern ulint	srv_auto_extend_increment;



extern ibool	srv_created_new_raw;

innobase/srv/srv0srv.c

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,9 @@ ulint srv_last_file_size_max = 0; /* if != 0, this tells 
						 the max size auto-extending

						 may increase the last data

						 file size */

ulint	srv_auto_extend_increment = 8;		 /* If the last data file is

						 auto-extended, we add this

						 many pages to it at a time */

ulint*  srv_data_file_is_raw_partition = NULL;



/* If the following is TRUE we do not allow inserts etc. This protects

sql/ha_innodb.cc

+9 −9
Original line number Diff line number Diff line
@@ -4346,12 +4346,12 @@ ha_innobase::update_table_comment( 
			   (ulong) innobase_get_free_space());

		dict_print_info_on_foreign_keys(FALSE, file, prebuilt->table);

		flen = ftell(file);

		if(length + flen + 3 > 64000) {

		if (flen < 0) {

			flen = 0;

		} else if (length + flen + 3 > 64000) {

			flen = 64000 - 3 - length;

		}



		ut_ad(flen > 0);



		/* allocate buffer for the full string, and

		read the contents of the temporary file */
@@ -4414,12 +4414,12 @@ ha_innobase::get_foreign_key_create_info(void) 
		prebuilt->trx->op_info = (char*)"";



		flen = ftell(file);

		if(flen > 64000 - 1) {

		if (flen < 0) {

			flen = 0;

		} else if(flen > 64000 - 1) {

			flen = 64000 - 1;

		}



		ut_ad(flen >= 0);



		/* allocate buffer for the string, and

		read the contents of the temporary file */
@@ -4800,12 +4800,12 @@ innodb_show_status( 
	srv_printf_innodb_monitor(srv_monitor_file);

	flen = ftell(srv_monitor_file);

	os_file_set_eof(srv_monitor_file);

	if(flen > 64000 - 1) {

	if (flen < 0) {

		flen = 0;

	} else if (flen > 64000 - 1) {

		flen = 64000 - 1;

	}



	ut_ad(flen > 0);



	/* allocate buffer for the string, and

	read the contents of the temporary file */

sql/ha_innodb.h

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ extern my_bool innobase_log_archive, 
extern "C" {

extern ulong srv_max_buf_pool_modified_pct;

extern ulong srv_max_purge_lag;

extern ulong srv_auto_extend_increment;

}



extern TYPELIB innobase_lock_typelib;