Commit 606ee28d authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-4.0/ 

into serg.mylan:/usr/home/serg/Abk/mysql-4.0
parents 7f7f4f30 7656b6da

BitKeeper/etc/logging_ok

+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ dellis@goetia.(none) 
dlenev@brandersnatch.localdomain

dlenev@build.mysql.com

dlenev@mysql.com

gbichot@quadxeon.mysql.com

gerberb@ou800.zenez.com

gluh@gluh.(none)

gluh@gluh.mysql.r18.ru
@@ -109,9 +110,11 @@ nick@mysql.com 
nick@nick.leippe.com

patg@krsna.patg.net

paul@central.snake.net

paul@frost.snake.net

paul@ice.local

paul@ice.snake.net

paul@kite-hub.kitebird.com

paul@snake-hub.snake.net

paul@teton.kitebird.com

pem@mysql.com

peter@linux.local

Build-tools/Do-compile

+10 −6
Original line number Diff line number Diff line
@@ -617,16 +617,20 @@ sub abort 


  if ($opt_user)

  {

    $mail_header_file="$opt_tmp/do-command.$$";

    open(TMP,">$mail_header_file");

    # Take the last 40 lines of the build log

    open(LOG, "$log") or die $!;

    my @log= <LOG>;

    close LOG;

    splice @log => 0, -40;

    my $mail_file="$opt_tmp/do-command.$$";

    open(TMP,">$mail_file") or die $!;

    print TMP "From: mysqldev\@$full_host_name\n";

    print TMP "To: $email\n";

    print TMP "Subject: $host($uname): $ver$opt_version_suffix compilation failed\n\n";

    print TMP @log;

    close TMP;

    system("tail -n 40 $log > $log.mail");

    system("cat $mail_header_file $log.mail | $sendmail -t -f $email");

    unlink($mail_header_file);

    unlink("$log.mail");

    system("$sendmail -t -f $email < $mail_file");

    unlink($mail_file);

  }

  exit 1;

}

Docs/changelog-4.0.xml

0 → 100755
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"

"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">

<!--

This is a dummy changelog file. Don't use it yet.

It merges upward without conflict.

-->

<appendix id="news-4-0-x">



 <title>

  Changes in release 4.0.x

 </title>



 <para>

  This is a dummy changelog file. Don't use it yet.

 </para>



</appendix>

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. 
AC_INIT(sql/mysqld.cc)

AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

AM_INIT_AUTOMAKE(mysql, 4.0.24)

AM_INIT_AUTOMAKE(mysql, 4.0.25)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

innobase/dict/dict0load.c

+8 −17
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ dict_load_table( 


	/* Check if the table name in record is the searched one */

	if (len != ut_strlen(name) || ut_memcmp(name, field, len) != 0) {



	err_exit:

		btr_pcur_close(&pcur);

		mtr_commit(&mtr);

		mem_heap_free(heap);
@@ -647,22 +647,6 @@ dict_load_table( 
		return(NULL);

	}



#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((char *) "SPACE",

		dict_field_get_col(

		dict_index_get_nth_field(
@@ -678,6 +662,13 @@ dict_load_table( 


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

	n_cols = mach_read_from_4(field);

	if (n_cols & 0x80000000UL) {

		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);

		goto err_exit;

	}



	table = dict_mem_table_create(name, space, n_cols);