Commit 702d34bb authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/opt/local/work/mysql-5.0-runtime
parents f8540ba7 f7bc05b6

mysql-test/r/federated.result

+2 −2
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ DROP TABLE federated.bug_17377_table; 
create table federated.t1 (i1 int, i2 int, i3 int);

create table federated.t2 (id int, c1 varchar(20), c2 varchar(20));

create table federated.t1 (i1 int, i2 int, i3 int) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';

create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:9308/federated/t2';

create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t2';

insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);

insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test");

select * from federated.t1 order by i1;
@@ -1649,7 +1649,7 @@ drop table federated.t1, federated.t2; 
create table federated.t1 (i1 int, i2 int, i3 int, primary key (i1));

create table federated.t2 (id int, c1 varchar(20), c2 varchar(20), primary key (id));

create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary key (i1)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';

create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2 varchar(20), primary key(id)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:9308/federated/t2';

create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2 varchar(20), primary key(id)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t2';

insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);

insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test");

select * from federated.t1 order by i1;

mysql-test/t/federated.test

+2 −0
Original line number Diff line number Diff line
@@ -1324,6 +1324,7 @@ create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)); 
connection master;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.t1 (i1 int, i2 int, i3 int) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2';

insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);

insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test");
@@ -1347,6 +1348,7 @@ create table federated.t2 (id int, c1 varchar(20), c2 varchar(20), primary key ( 
connection master;

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary key (i1)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';

--replace_result $SLAVE_MYPORT SLAVE_PORT

eval create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2 varchar(20), primary key(id)) ENGINE=FEDERATED CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t2';

insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);

insert into federated.t2 values (9,"abc","def"),(5,"opq","lmn"),(2,"test t","t test");

ndb/src/mgmsrv/ConfigInfo.cpp

+1 −1
Original line number Diff line number Diff line
@@ -853,7 +853,7 @@ const ConfigInfo::ParamInfo ConfigInfo::m_ParamInfo[] = { 
    false,

    ConfigInfo::CI_INT,

    "8",

    "1",

    "3",

    STR_VALUE(MAX_INT_RNIL) },



  {

sql/ha_ndbcluster.cc

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ static int update_status_variables(Ndb_cluster_connection *c) 


struct show_var_st ndb_status_variables[]= {

  {"cluster_node_id",        (char*) &ndb_cluster_node_id,         SHOW_LONG},

  {"connected_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},

  {"connected_port",         (char*) &ndb_connected_port,          SHOW_LONG},

  {"config_from_host",         (char*) &ndb_connected_host,      SHOW_CHAR_PTR},

  {"config_from_port",         (char*) &ndb_connected_port,          SHOW_LONG},

//  {"number_of_replicas",     (char*) &ndb_number_of_replicas,      SHOW_LONG},

  {"number_of_storage_nodes",(char*) &ndb_number_of_storage_nodes, SHOW_LONG},

  {NullS, NullS, SHOW_LONG}