Commit 2351ac24 authored by gni@dev3-221.dev.cn.tlan's avatar gni@dev3-221.dev.cn.tlan
Browse files

Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298 

into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
parents 403c0b35 60a18580

mysql-test/r/bdb_notembedded.result

0 → 100644
+35 −0
Original line number Diff line number Diff line 
set autocommit=1;

reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

drop table bug16206;

reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

f	n	Format_desc	1	n	Server ver: VERSION, Binlog ver: 4

f	n	Query	1	n	use `test`; create table bug16206 (a int) engine=         bdb

f	n	Query	1	n	use `test`; insert into bug16206 values(0)

f	n	Query	1	n	use `test`; insert into bug16206 values(1)

f	n	Query	1	n	use `test`; BEGIN

f	n	Query	1	n	use `test`; insert into bug16206 values(2)

f	n	Query	1	n	use `test`; COMMIT

f	n	Query	1	n	use `test`; insert into bug16206 values(3)

drop table bug16206;

set autocommit=0;

End of 5.0 tests

mysql-test/t/bdb_notembedded.test

0 → 100644
+38 −0
Original line number Diff line number Diff line 
-- source include/not_embedded.inc

-- source include/have_bdb.inc



#

# Bug #16206: Superfluous COMMIT event in binlog when updating BDB in autocommit mode

#

set autocommit=1;



let $VERSION=`select version()`;



reset master;

create table bug16206 (a int);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



reset master;

create table bug16206 (a int) engine=         bdb;

insert into bug16206 values(0);

insert into bug16206 values(1);

start transaction;

insert into bug16206 values(2);

commit;

insert into bug16206 values(3);

--replace_result $VERSION VERSION

--replace_column 1 f 2 n 5 n

show binlog events;

drop table bug16206;



set autocommit=0;





--echo End of 5.0 tests

storage/ndb/include/kernel/ndb_limits.h

+11 −0
Original line number Diff line number Diff line
@@ -28,6 +28,17 @@ 
#define MAX_NODES     64

#define UNDEF_NODEGROUP 0xFFFF



/**************************************************************************

 * IT SHOULD BE (MAX_NDB_NODES - 1).

 * WHEN MAX_NDB_NODE IS CHANGED, IT SHOULD BE CHANGED ALSO

 **************************************************************************/

#define MAX_DATA_NODE_ID 48

/**************************************************************************

 * IT SHOULD BE (MAX_NODES - 1).

 * WHEN MAX_NODES IS CHANGED, IT SHOULD BE CHANGED ALSO

 **************************************************************************/

#define MAX_NODES_ID 63



/**

 * MAX_API_NODES = MAX_NODES - No of NDB Nodes in use

 */

storage/ndb/src/mgmsrv/ConfigInfo.cpp

+6 −6
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_DATA_NODE_ID) },



  {

    CFG_NODE_ID,
@@ -409,7 +409,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_DATA_NODE_ID) },



  {

    KEY_INTERNAL,
@@ -1404,7 +1404,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },



  {

    CFG_NODE_ID,
@@ -1416,7 +1416,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },



  {

    KEY_INTERNAL,
@@ -1547,7 +1547,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },

  

  {

    CFG_NODE_ID,
@@ -1559,7 +1559,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    ConfigInfo::CI_INT,

    MANDATORY,

    "1",

    STR_VALUE(MAX_NODES) },

    STR_VALUE(MAX_NODES_ID) },

  

  {

    CFG_LOG_DESTINATION,