Commit 46d8e5fa authored by unknown's avatar unknown
Browse files

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  zim.(none):/home/brian/mysql/dep-5.1
parents 3aa2d18c 7b111efc

BUILD/autorun.sh

+10 −7
Original line number Diff line number Diff line
@@ -3,20 +3,23 @@ 


die() { echo "$@"; exit 1; }



# Added glibtoolize reference to make native OSX autotools work

if [ -f /usr/bin/glibtoolize ]

  then

    LIBTOOLIZE=glibtoolize

  else

    LIBTOOLIZE=libtoolize

fi



(cd storage/bdb/dist && sh s_all)

(cd storage/innobase && aclocal && autoheader && \

    libtoolize --automake --force --copy && \

    $LIBTOOLIZE --automake --force --copy && \

    automake --force --add-missing --copy && autoconf)



aclocal || die "Can't execute aclocal" 

autoheader || die "Can't execute autoheader"

# --force means overwrite ltmain.sh script if it already exists 

# Added glibtoolize reference to make native OSX autotools work

if test -f /usr/bin/glibtoolize  ; then

  glibtoolize --automake --force || die "Can't execute glibtoolize"

else

  libtoolize --automake --force || die "Can't execute libtoolize"

fi

$LIBTOOLIZE --automake --force || die "Can't execute libtoolize"

  

# --add-missing instructs automake to install missing auxiliary files

# and --force to overwrite them if they already exist

mysql-test/r/ctype_utf8.result

+4 −4
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) CHARACTER SET utf8 DEFAULT NULL,

  UNIQUE KEY `a` USING HASH (`c`(1))

  UNIQUE KEY `a` (`c`(1)) USING HASH

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');
@@ -448,7 +448,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) CHARACTER SET utf8 DEFAULT NULL,

  UNIQUE KEY `a` USING BTREE (`c`(1))

  UNIQUE KEY `a` (`c`(1)) USING BTREE

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');
@@ -570,7 +570,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,

  UNIQUE KEY `a` USING HASH (`c`(1))

  UNIQUE KEY `a` (`c`(1)) USING HASH

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');
@@ -606,7 +606,7 @@ show create table t1; 
Table	Create Table

t1	CREATE TABLE `t1` (

  `c` char(10) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,

  UNIQUE KEY `a` USING BTREE (`c`(1))

  UNIQUE KEY `a` (`c`(1)) USING BTREE

) ENGINE=MEMORY DEFAULT CHARSET=latin1

insert into t1 values ('a'),('b'),('c'),('d'),('e'),('f');

insert into t1 values ('aa');

mysql-test/r/heap.result

+3 −3
Original line number Diff line number Diff line
@@ -556,9 +556,9 @@ t1 CREATE TABLE `t1` ( 
  `v` varchar(10) DEFAULT NULL,

  `c` char(10) DEFAULT NULL,

  `t` varchar(50) DEFAULT NULL,

  KEY `v` USING BTREE (`v`),

  KEY `c` USING BTREE (`c`),

  KEY `t` USING BTREE (`t`(10))

  KEY `v` (`v`) USING BTREE,

  KEY `c` (`c`) USING BTREE,

  KEY `t` (`t`(10)) USING BTREE

) ENGINE=MEMORY DEFAULT CHARSET=latin1

select count(*) from t1;

count(*)

mysql-test/r/ndb_index_unique.result

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ CREATE TABLE t2 ( 
a int unsigned NOT NULL PRIMARY KEY,

b int unsigned not null,

c int unsigned not null,

UNIQUE USING HASH (b, c)	

UNIQUE (b, c) USING HASH	

) engine=ndbcluster;

insert t2 values(1, 2, 3), (2, 3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);

select * from t2 where a = 3;
@@ -142,14 +142,14 @@ CREATE TABLE t2 ( 
a int unsigned NOT NULL PRIMARY KEY,

b int unsigned not null,

c int unsigned,

UNIQUE USING HASH (b, c)	

UNIQUE (b, c) USING HASH	

) engine=ndbcluster;

ERROR 42000: Column 'c' is used with UNIQUE or INDEX but is not defined as NOT NULL

CREATE TABLE t3 (

a int unsigned NOT NULL,

b int unsigned not null,

c int unsigned,

PRIMARY KEY USING HASH (a, b)	

PRIMARY KEY (a, b) USING HASH         

) engine=ndbcluster;

insert t3 values(1, 2, 3), (2, 3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);

select * from t3 where a = 3;

mysql-test/r/ndb_partition_key.result

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ a b c 
1	12	3

DROP TABLE t1;

CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,

PRIMARY KEY USING HASH (a,b,c))

PRIMARY KEY (a,b,c) USING HASH)

ENGINE=NDB

DEFAULT CHARSET=latin1

PARTITION BY KEY (b);
@@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( 
  `b` char(10) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',

  `c` int(11) NOT NULL DEFAULT '0',

  `d` int(11) DEFAULT NULL,

  PRIMARY KEY USING HASH (`a`,`b`,`c`)

  PRIMARY KEY (`a`,`b`,`c`) USING HASH

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (b) 

DROP TABLE t1;

CREATE TABLE t1 (a int not null primary key)