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

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1 

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge


sql/ha_ndbcluster.cc:
  Auto merged
parents b517073e 3298faa1

config/ac-macros/compiler_flag.m4

+22 −0
Original line number Diff line number Diff line
@@ -38,3 +38,25 @@ AC_DEFUN([AC_SYS_OS_COMPILER_FLAG], 
 fi

])



AC_DEFUN([AC_CHECK_NOEXECSTACK],

[

 AC_CACHE_CHECK(whether --noexecstack is desirable for .S files,

		mysql_cv_as_noexecstack, [dnl

  cat > conftest.c <<EOF

void foo (void) { }

EOF

  if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS

		     -S -o conftest.s conftest.c 1>&AS_MESSAGE_LOG_FD]) \

     && grep .note.GNU-stack conftest.s >/dev/null \

     && AC_TRY_COMMAND([${CC-cc} $CCASFLAGS $CPPFLAGS -Wa,--noexecstack

		       -c -o conftest.o conftest.s 1>&AS_MESSAGE_LOG_FD])

  then

    mysql_cv_as_noexecstack=yes

  else

    mysql_cv_as_noexecstack=no

  fi

  rm -f conftest*])

 if test $mysql_cv_as_noexecstack = yes; then

   CCASFLAGS="$CCASFLAGS -Wa,--noexecstack"

 fi

])

configure.in

+4 −0
Original line number Diff line number Diff line
@@ -482,6 +482,10 @@ AM_PROG_CC_STDC 


# We need an assembler, too

AM_PROG_AS

CCASFLAGS="$CCASFLAGS $ASFLAGS"



# Check if we need noexec stack for assembler

AC_CHECK_NOEXECSTACK



if test "$am_cv_prog_cc_stdc" = "no"

then

mysql-test/r/insert_select.result

+5 −0
Original line number Diff line number Diff line
@@ -690,3 +690,8 @@ CREATE TABLE t1 (a int PRIMARY KEY); 
INSERT INTO t1 values (1), (2);

INSERT INTO t1 SELECT a + 2 FROM t1 LIMIT 1;

DROP TABLE t1;

CREATE TABLE t1 (x int, y int);

CREATE TABLE t2 (z int, y int);

CREATE TABLE t3 (a int, b int);

INSERT INTO t3 (SELECT x, y FROM t1 JOIN t2 USING (y) WHERE z = 1);

DROP TABLE IF EXISTS t1,t2,t3;

mysql-test/r/key.result

+10 −0
Original line number Diff line number Diff line
@@ -330,6 +330,16 @@ alter table t1 add key (c1,c1,c2); 
ERROR 42S21: Duplicate column name 'c1'

drop table t1;

create table t1 (

i1 INT NOT NULL,

i2 INT NOT NULL,

UNIQUE i1idx (i1),

UNIQUE i2idx (i2));

desc t1;

Field	Type	Null	Key	Default	Extra

i1	int(11)	NO	UNI		

i2	int(11)	NO	UNI		

drop table t1;

create table t1 (

c1 int,

c2 varchar(20) not null,

primary key (c1),

mysql-test/r/ndb_dd_ddl.result

+18 −0
Original line number Diff line number Diff line
@@ -188,6 +188,19 @@ ENGINE NDB; 
CREATE INDEX b_i on t1(b);

CREATE INDEX bc_i on t1(b, c);

DROP TABLE t1;

CREATE TABLESPACE ts2

ADD DATAFILE 'datafile3.dat'

USE LOGFILE GROUP lg1

INITIAL_SIZE 1M

ENGINE NDB;

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile3.dat'

ENGINE NDB;

ERROR HY000: Failed to alter:  NO SUCH FILE

ALTER TABLESPACE ts2

DROP DATAFILE 'datafile2.dat'

ENGINE NDB;

ERROR HY000: Failed to alter:  NO SUCH FILE

ALTER TABLESPACE ts1

DROP DATAFILE 'datafile2.dat'

ENGINE NDB;
@@ -196,6 +209,11 @@ DROP DATAFILE 'datafile.dat' 
ENGINE NDB;

DROP TABLESPACE ts1

ENGINE NDB;

ALTER TABLESPACE ts2

DROP DATAFILE 'datafile3.dat'

ENGINE NDB;

DROP TABLESPACE ts2

ENGINE NDB;

DROP LOGFILE GROUP lg1

ENGINE NDB;

**** End = And No =  ****