Commit ad32d855 authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb


mysql-test/t/disabled.def:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents cccd302c 32b3a9fe

config/ac-macros/ha_ndbcluster.m4

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [ 


  if test X"$have_ndb_binlog" = Xyes

  then

    AC_DEFINE([HAVE_NDB_BINLOG], [1],

    AC_DEFINE([WITH_NDB_BINLOG], [1],

              [Including Ndb Cluster Binlog])

    AC_MSG_RESULT([Including Ndb Cluster Binlog])

  else

config/ac-macros/replication.m4

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ AC_DEFUN([MYSQL_CHECK_REPLICATION], [ 


  case "$row_based" in

  yes )

    AC_DEFINE([HAVE_ROW_BASED_REPLICATION], [1], [Define to have row-based replication])

    AC_DEFINE([WITH_ROW_BASED_REPLICATION], [1], [Define to have row-based replication])

    AC_MSG_RESULT([-- including row-based replication])

    [have_row_based=yes]

    ;;

include/my_global.h

+9 −0
Original line number Diff line number Diff line
@@ -78,6 +78,15 @@ 
#endif

#endif /* _WIN32... */



#ifndef EMBEDDED_LIBRARY

#ifdef WITH_ROW_BASED_REPLICATION

#define HAVE_ROW_BASED_REPLICATION 1

#endif

#ifdef WITH_NDB_BINLOG

#define HAVE_NDB_BINLOG 1

#endif

#endif /* !EMBEDDED_LIBRARY */



/* Some defines to avoid ifdefs in the code */

#ifndef NETWARE_YIELD

#define NETWARE_YIELD

libmysqld/Makefile.am

+7 −4
Original line number Diff line number Diff line
@@ -167,10 +167,13 @@ link_sources: 
	    rm -f $$f; \

	    @LN_CP_F@ $(top_srcdir)/libmysql/$$f $$f; \

	  done; \

	  for f in $(sqlstoragesources); do \

	    rm -f $$f; \

	    @LN_CP_F@ `find $(srcdir)/../sql -name $$f` $$f; \

	  if test -n "$(sqlstoragesources)" ; \

	  then \

	    for f in "$(sqlstoragesources)"; do \

	      rm -f "$$f"; \

	      @LN_CP_F@ `find $(srcdir)/../sql -name "$$f"` "$$f"; \

	    done; \

	  fi; \

	  rm -f client_settings.h; \

	  @LN_CP_F@ $(top_srcdir)/libmysql/client_settings.h client_settings.h

mysql-test/r/ndb_basic.result

+0 −7
Original line number Diff line number Diff line
@@ -6,13 +6,6 @@ attr1 INT NOT NULL, 
attr2 INT,

attr3 VARCHAR(10)

) ENGINE=ndbcluster;

drop table t1;

CREATE TABLE t1 (

pk1 INT NOT NULL PRIMARY KEY,

attr1 INT NOT NULL,

attr2 INT,

attr3 VARCHAR(10)

) ENGINE=ndbcluster;

SHOW INDEX FROM t1;

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment

t1	0	PRIMARY	1	pk1	A	0	NULL	NULL		BTREE