Commit abe6094a authored by unknown's avatar unknown
Browse files

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

into serg.mylan:/usr/home/serg/Abk/mysql-4.1
parents f70688e2 8ce20712

innobase/dict/dict0load.c

+0 −33
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ dict_load_table( 
	ulint		space;

	ulint		n_cols;

	ulint		err;

	ulint		mix_len;

	mtr_t		mtr;

	

#ifdef UNIV_SYNC_DEBUG
@@ -776,38 +775,6 @@ dict_load_table( 
		return(NULL);

	}



	/* Track a corruption bug reported on the MySQL mailing list Jan 14,

	2005: mix_len had a value different from 0 */



	field = rec_get_nth_field(rec, 7, &len);

	ut_a(len == 4);



	mix_len = mach_read_from_4(field);



	if (mix_len != 0 && mix_len != 0x80000000) {

		ut_print_timestamp(stderr);

		

		fprintf(stderr,

			"  InnoDB: table %s has a nonsensical mix len %lu\n",

			name, (ulong)mix_len);

	}



#if MYSQL_VERSION_ID < 50300

	/* Starting from MySQL 5.0.3, the high-order bit of MIX_LEN is the

	"compact format" flag. */

	field = rec_get_nth_field(rec, 7, &len);

	if (mach_read_from_1(field) & 0x80) {

		btr_pcur_close(&pcur);

		mtr_commit(&mtr);

		mem_heap_free(heap);

		ut_print_timestamp(stderr);

		fprintf(stderr,

			"  InnoDB: table %s is in the new compact format\n"

			"InnoDB: of MySQL 5.0.3 or later\n", name);

		return(NULL);

	}

#endif /* MYSQL_VERSION_ID < 50300 */



	ut_a(0 == ut_strcmp("SPACE",

		dict_field_get_col(

		dict_index_get_nth_field(

innobase/include/srv0srv.h

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ extern ibool srv_use_doublewrite_buf; 
extern ibool    srv_set_thread_priorities;

extern int      srv_query_thread_priority;



extern ulong	srv_max_buf_pool_modified_pct;

extern ulong	srv_max_purge_lag;

extern ibool	srv_use_awe;

extern ibool	srv_use_adaptive_hash_indexes;

innobase/srv/srv0srv.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ in the buffer pool to all database pages in the buffer pool smaller than 
the following number. But it is not guaranteed that the value stays below

that during a time of heavy update/insert activity. */



ulint	srv_max_buf_pool_modified_pct	= 90;

ulong	srv_max_buf_pool_modified_pct	= 90;



/* If the following is != 0 we do not allow inserts etc. This protects

the user from forgetting the innodb_force_recovery keyword to my.cnf */

mysql-test/mysql-test-run.sh

+18 −0
Original line number Diff line number Diff line
@@ -817,6 +817,18 @@ skip_test() { 
   $ECHO "$RES$RES_SPACE [ skipped ]"

}





disable_test() {

   USERT="    ...."

   SYST="    ...."

   REALT="    ...."

   pname=`$ECHO "$1                        "|$CUT -c 1-24`

   RES="$pname"

   skip_inc

   $ECHO "$RES$RES_SPACE [ disabled ]  $2"

}





report_current_test () {

   tname=$1

   echo "CURRENT_TEST: $tname" >> $MASTER_MYERR
@@ -1471,6 +1483,12 @@ run_testcase () 
 if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then

   result_file="$result_file$RESULT_EXT"

 fi

 if [ -f "$TESTDIR/$tname.disabled" ]

 then

   comment=`$CAT $TESTDIR/$tname.disabled`;

   disable_test $tname "$comment"

   return

 fi

 if [ "$USE_MANAGER" = 1 ] ; then

  many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`

 fi

mysql-test/r/mysqldump.result

+0 −14
Original line number Diff line number Diff line
@@ -530,11 +530,6 @@ DROP TABLE t1; 
DROP TABLE t2;

CREATE TABLE t1 (`b` blob);

INSERT INTO `t1` VALUES (0x602010000280100005E71A);

-- MySQL dump 10.9

--

-- Host: localhost    Database: test

-- ------------------------------------------------------

-- Server version	4.1.11-debug-log



/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;

/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -544,20 +539,11 @@ INSERT INTO `t1` VALUES (0x602010000280100005E71A); 
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;

/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;

/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;



--

-- Table structure for table `t1`

--



DROP TABLE IF EXISTS `t1`;

CREATE TABLE `t1` (

  `b` blob

) ENGINE=MyISAM DEFAULT CHARSET=latin1;



--

-- Dumping data for table `t1`

--





/*!40000 ALTER TABLE `t1` DISABLE KEYS */;

LOCK TABLES `t1` WRITE;