Commit 4f9ba9fe authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-wl1892


sql/ha_ndbcluster_binlog.cc:
  Auto merged
storage/ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
storage/ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
parents 1939dacd e13a3037

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.1.6-alpha)

AM_INIT_AUTOMAKE(mysql, 5.1.7-beta)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10

mysql-test/r/ndb_binlog_ddl_multi.result

+0 −7
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ master-bin1.000001 # Query # # use `test`; alter table t2 add column (b int) 
reset master;

reset master;

ALTER DATABASE mysqltest CHARACTER SET latin1;

insert into mysqltest.t1 values (1);

drop table mysqltest.t1;

show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info
@@ -39,12 +38,6 @@ master-bin.000001 # Query # # ALTER DATABASE mysqltest CHARACTER SET latin1 
master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Table_map	#	#	mysqltest.t1

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	BEGIN

master-bin.000001	#	Table_map	#	#	cluster_replication.apply_status

master-bin.000001	#	Write_rows	#	#	

master-bin.000001	#	Query	#	#	COMMIT

master-bin.000001	#	Query	#	#	use `mysqltest`; drop table `t1`

reset master;

mysql-test/r/ndb_dd_basic.result

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ CREATE TABLE t1 
(pk1 INT NOT NULL PRIMARY KEY, b INT NOT NULL, c INT NOT NULL)

TABLESPACE ts1 STORAGE DISK

ENGINE=NDB;

SHOW CREATE TABLE t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `pk1` int(11) NOT NULL,

  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY  (`pk1`)

) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

INSERT INTO t1 VALUES (0, 0, 0);

SELECT * FROM t1;

pk1	b	c

mysql-test/r/ndb_dd_disk2memory.result

+2 −2
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ t1 CREATE TABLE `t1` ( 
  `b` int(11) NOT NULL,

  `c` int(11) NOT NULL,

  PRIMARY KEY  (`pk1`)

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

) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK

ENGINE=NDB;

SHOW CREATE TABLE test.t2;
@@ -236,7 +236,7 @@ t2 CREATE TABLE `t2` ( 
  `b2` int(11) NOT NULL,

  `c2` int(11) NOT NULL,

  PRIMARY KEY  (`pk2`)

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

) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 

ALTER TABLE test.t1 ENGINE=NDBCLUSTER;

SHOW CREATE TABLE test.t1;

Table	Create Table

mysql-test/t/ndb_binlog_ddl_multi.test

+0 −1
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ ALTER DATABASE mysqltest CHARACTER SET latin1; 


# drop table and drop should come after data events

--connection server2

insert into mysqltest.t1 values (1);

drop table mysqltest.t1;



--connection server1