Commit 2acfc2b9 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb


ndb/include/ndbapi/NdbDictionary.hpp:
  Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
  Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents d078687a 9d9d7582

mysql-test/r/ndb_alter_table.result

+4 −4
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ col5 enum('PENDING', 'ACTIVE', 'DISABLED') not null, 
col6 int not null, to_be_deleted int)  ENGINE=ndbcluster;

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	0	0	0	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	0	0	0	0	0	0	1	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

SET SQL_MODE=NO_AUTO_VALUE_ON_ZERO;

insert into t1 values

(0,4,3,5,"PENDING",1,7),(NULL,4,3,5,"PENDING",1,7),(31,4,3,5,"PENDING",1,7), (7,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7), (100,4,3,5,"PENDING",1,7), (99,4,3,5,"PENDING",1,7), (8,4,3,5,"PENDING",1,7), (NULL,4,3,5,"PENDING",1,7);

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	9	0	0	0	0	0	101	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	9	96	131072	0	0	0	101	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

select * from t1 order by col1;

col1	col2	col3	col4	col5	col6	to_be_deleted

0	4	3	5	PENDING	1	7
@@ -60,7 +60,7 @@ change column col2 fourth varchar(30) not null after col3, 
modify column col6 int not null first;

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	9	0	0	0	0	0	102	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	9	152	131072	0	0	0	102	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

select * from t1 order by col1;

col6	col1	col3	fourth	col4	col4_5	col5	col7	col8

1	0	3	4	5		PENDING		0000-00-00 00:00:00
@@ -75,7 +75,7 @@ col6 col1 col3 fourth col4 col4_5 col5 col7 col8 
insert into t1 values (2, NULL,4,3,5,99,"PENDING","EXTRA",'2004-01-01 00:00:00');

show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t1	ndbcluster	10	Dynamic	10	0	0	0	0	0	103	NULL	NULL	NULL	latin1_swedish_ci	NULL		

t1	ndbcluster	10	Dynamic	10	152	131072	0	0	0	103	NULL	NULL	NULL	latin1_swedish_ci	NULL		number_of_replicas: 2

select * from t1 order by col1;

col6	col1	col3	fourth	col4	col4_5	col5	col7	col8

1	0	3	4	5		PENDING		0000-00-00 00:00:00

mysql-test/r/ndb_autodiscover.result

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ flush tables; 
show table status;

Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment

t6	MyISAM	9	Fixed	1	260	#	#	#	0	NULL	#	#	NULL	#	NULL		

t7	ndbcluster	9	Fixed	1	0	#	#	#	0	NULL	#	#	NULL	#	NULL		

t7	ndbcluster	9	Fixed	1	276	#	#	#	0	NULL	#	#	NULL	#	NULL		number_of_replicas: 2

show status like 'handler_discover%';

Variable_name	Value

Handler_discover	2

ndb/examples/ndbapi_event_example/ndbapi_event.cpp

+6 −5
Original line number Diff line number Diff line
@@ -70,12 +70,13 @@ 
 * mysql> use TEST_DB;

 * mysql> create table TAB0 (COL0 int primary key, COL1 int, COL11 int) engine=ndb;

 *

 * In another window start ndbapi_example5, wait until properly started

 * In another window start ndbapi_event, wait until properly started

 *

 * mysql> insert into TAB0 values (1,2,3);

 * mysql> insert into TAB0 values (2,2,3);

 * mysql> insert into TAB0 values (3,2,9);

 * mysql> 

   insert into TAB0 values (1,2,3);

   insert into TAB0 values (2,2,3);

   insert into TAB0 values (3,2,9);

   update TAB0 set COL1=10 where COL0=1;

   delete from TAB0 where COL0=1;

 *

 * you should see the data popping up in the example window

 *

ndb/include/kernel/AttributeHeader.hpp

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public: 
  STATIC_CONST( RANGE_NO     = 0xFFFB ); // Read range no (when batched ranges)

  

  STATIC_CONST( ROW_SIZE     = 0xFFFA );

  STATIC_CONST( FRAGMENT_MEMORY= 0xFFF9 );



  /** Initialize AttributeHeader at location aHeaderPtr */

  static AttributeHeader& init(void* aHeaderPtr, Uint32 anAttributeId,

ndb/include/kernel/trigger_definitions.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ struct TriggerActionTime { 
};



struct TriggerEvent {

  /** TableEvent must match 1 << TriggerEvent */

  enum Value {

    TE_INSERT = 0,

    TE_DELETE = 1,