bk commit into 5.1 tree (tomas:1.2041)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2041 06/01/12 17:26:39 tomas@stripped +3 -0
  merge and test fix

  mysql-test/r/rpl_ndb_disk.result
    1.1 06/01/12 17:26:28 tomas@stripped +74 -0
    New BitKeeper file ``mysql-test/r/rpl_ndb_disk.result''

  storage/ndb/include/ndbapi/NdbDictionary.hpp
    1.61 06/01/12 17:26:28 tomas@stripped +1 -1
    merge and test fix

  mysql-test/t/rpl_ndb_disk.test
    1.2 06/01/12 17:26:28 tomas@stripped +8 -0
    merge and test fix

  mysql-test/r/rpl_ndb_disk.result
    1.0 06/01/12 17:26:28 tomas@stripped +0 -0
    BitKeeper file /home/tomas/mysql-5.1-wl2325-v6/mysql-test/r/rpl_ndb_disk.result

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-v6

--- 1.60/storage/ndb/include/ndbapi/NdbDictionary.hpp	2006-01-12 17:04:27 +01:00
+++ 1.61/storage/ndb/include/ndbapi/NdbDictionary.hpp	2006-01-12 17:26:28 +01:00
@@ -1057,7 +1057,7 @@
       _TE_STOP=9,
       _TE_NODE_FAILURE=10,
       _TE_SUBSCRIBE=11,
-      _TE_UNSUBSCRIBE=12
+      _TE_UNSUBSCRIBE=12,
       _TE_NUL=13 // internal (INS o DEL within same GCI)
     };
 #endif
--- New file ---
+++ mysql-test/r/rpl_ndb_disk.result	06/01/12 17:26:28
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP TABLE IF EXISTS t1;
CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB;
alter logfile group lg1
add undofile 'undofile02.dat'
initial_size 4M engine=ndb;
CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB;
alter tablespace ts1
add datafile 'datafile02.dat'
initial_size 4M engine=ndb;
CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb;
insert into t1 values (1,2,3);
select * from t1 order by pk1;
pk1	b	c
1	2	3
select * from t1 order by pk1;
pk1	b	c
1	2	3
show binlog events;
Log_name	Pos	Event_type	Server_id	End_log_pos	Info
master-bin.000001	4	Format_desc	1	102	Server ver: VERSION, Binlog ver: 4
master-bin.000001	102	Query	1	188	use `test`; DROP TABLE IF EXISTS t1
master-bin.000001	188	Query	1	353	CREATE LOGFILE GROUP lg1
ADD UNDOFILE 'undofile.dat'
INITIAL_SIZE 16M
UNDO_BUFFER_SIZE = 1M
ENGINE=NDB
master-bin.000001	353	Query	1	496	alter logfile group lg1
add undofile 'undofile02.dat'
initial_size 4M engine=ndb
master-bin.000001	496	Query	1	658	CREATE TABLESPACE ts1
ADD DATAFILE 'datafile.dat'
USE LOGFILE GROUP lg1
INITIAL_SIZE 12M
ENGINE NDB
master-bin.000001	658	Query	1	798	alter tablespace ts1
add datafile 'datafile02.dat'
initial_size 4M engine=ndb
master-bin.000001	798	Query	1	978	use `test`; CREATE TABLE t1
(pk1 int not null primary key, b int not null, c int not null)
tablespace ts1 storage disk
engine ndb
master-bin.000001	978	Query	1	1042	BEGIN
master-bin.000001	1042	Table_map	1	65	cluster_replication.apply_status
master-bin.000001	1107	Write_rows	1	107	
master-bin.000001	1149	Table_map	1	148	test.t1
master-bin.000001	1190	Write_rows	1	190	
master-bin.000001	1232	Query	1	1297	COMMIT
drop table t1;
drop table t1;
alter tablespace ts1
drop datafile 'datafile.dat'
engine=ndb;
alter tablespace ts1
drop datafile 'datafile02.dat'
engine=ndb;
DROP LOGFILE GROUP lg1 ENGINE=NDB;
DROP TABLESPACE ts1 ENGINE=NDB;


--- 1.1/mysql-test/t/rpl_ndb_disk.test	2006-01-11 16:26:48 +01:00
+++ 1.2/mysql-test/t/rpl_ndb_disk.test	2006-01-12 17:26:28 +01:00
@@ -76,4 +76,12 @@
 #
 
 drop table t1;
+alter tablespace ts1
+drop datafile 'datafile.dat'
+engine=ndb;
+alter tablespace ts1
+drop datafile 'datafile02.dat'
+engine=ndb;
+DROP TABLESPACE ts1 ENGINE=NDB;
+DROP LOGFILE GROUP lg1 ENGINE=NDB;
 --sync_slave_with_master