Commit 3aa1605f authored by unknown's avatar unknown
Browse files

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

into three.local.lan:/home/matthias/Arbeit/mysql-4.1/src
parents 6daf2bcf e0527832

Makefile.am

+1 −5
Original line number Diff line number Diff line
@@ -100,8 +100,4 @@ tags: 
# Test installation



test:

	cd mysql-test

	./mysql-test-run

	./mysql-test-run --ps-protocol



	cd mysql-test; ./mysql-test-run && ./mysql-test-run --ps-protocol

innobase/dict/dict0load.c

+16 −0
Original line number Diff line number Diff line
@@ -765,6 +765,22 @@ 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("SPACE",

		dict_field_get_col(

		dict_index_get_nth_field(

mysql-test/mysql-test-run.sh

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ start_ndbcluster() 
    else

      NDBCLUSTER_EXTRA_OPTS="--small"

    fi

    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --diskless --initial || exit 1

    ./ndb/ndbcluster $NDBCLUSTER_OPTS $NDBCLUSTER_EXTRA_OPTS --initial || exit 1

    NDB_CONNECTSTRING="host=localhost:$NDBCLUSTER_PORT"

  else

    NDB_CONNECTSTRING="$USE_RUNNING_NDBCLUSTER"

mysql-test/r/group_by.result

+12 −0
Original line number Diff line number Diff line
@@ -638,3 +638,15 @@ alias 
1,2

1

drop table t1;

create table t1 (a int);

insert into t1 values(null);

select min(a) is null from t1;

min(a) is null

1

select min(a) is null or null from t1;

min(a) is null or null

1

select 1 and min(a) is null from t1;

1 and min(a) is null

1

drop table t1;

mysql-test/r/insert_select.result.es

+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,13 @@ a 
1

2

drop table t1, t2;

create table t1(a int);

insert into t1 values(1),(1);

reset master;

create table t2(unique(a)) select a from t1;

ERROR 23000: Duplicate entry '1' for key 1

show binlog events;

drop table t1;

create table t1 (a int not null);

create table t2 (a int not null);

insert into t1 values (1);