Commit d922e834 authored by unknown's avatar unknown
Browse files

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

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
parents 55e9c051 ccbdf093

mysql-test/r/ndb_autodiscover3.result

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ select * from t2; 
ERROR 42S02: Table 'test.t2' doesn't exist

show tables like 't2';

Tables_in_test (t2)

reset master;

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;
@@ -30,10 +31,12 @@ a 
1

2

3

reset master;

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

show tables like 't2';

Tables_in_test (t2)

reset master;

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;
@@ -46,4 +49,5 @@ a 
1

2

3

reset master;

drop table t2;

mysql-test/t/disabled.def

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ events_scheduling : BUG#19170 2006-04-26 andrey Test case of 19170 fails 
events_logs_tests        : BUG#17619 2006-05-16 andrey  Test case problems

ndb_autodiscover         : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

ndb_autodiscover2        : BUG#18952 2006-02-16 jmiller Needs to be fixed w.r.t binlog

ndb_binlog_discover      : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown

#ndb_binlog_discover      : BUG#19395 2006-04-28 tomas/knielsen mysqld does not always detect cluster shutdown

#ndb_cache2               : BUG#18597 2006-03-28 brian simultaneous drop table and ndb statistics update triggers node failure

#ndb_cache_multi2         : BUG#18597 2006-04-10 kent  simultaneous drop table and ndb statistics update triggers node failure

ndb_load                 : BUG#17233 2006-05-04 tomas failed load data from infile causes mysqld dbug_assert, binlog not flushed

mysql-test/t/ndb_autodiscover3.test

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ select * from t2 order by a limit 3; 
--error ER_NO_SUCH_TABLE

select * from t2;

show tables like 't2';

reset master;

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;
@@ -50,6 +51,7 @@ select * from t2 order by a limit 3; 
# server 1 should have a stale cache, and in this case wrong frm, transaction must be retried

--connection server1

select * from t2 order by a limit 3;

reset master;



--exec $NDB_MGM --no-defaults -e "all restart -i" >> $NDB_TOOLS_OUTPUT

--exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults >> $NDB_TOOLS_OUTPUT
@@ -60,6 +62,7 @@ select * from t2 order by a limit 3; 
--error ER_NO_SUCH_TABLE

select * from t2;

show tables like 't2';

reset master;

create table t2 (a int key) engine=ndbcluster;

insert into t2 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);

select * from t2 order by a limit 3;
@@ -67,6 +70,7 @@ select * from t2 order by a limit 3; 
# server 2 should have a stale cache, but with right frm, transaction need not be retried

--connection server2

select * from t2 order by a limit 3;

reset master;



drop table t2;

# End of 4.1 tests

sql/ha_ndbcluster.cc

+10 −6
Original line number Diff line number Diff line
@@ -182,6 +182,8 @@ static const char * ndb_connected_host= 0; 
static long ndb_connected_port= 0;

static long ndb_number_of_replicas= 0;

long ndb_number_of_storage_nodes= 0;

long ndb_number_of_ready_storage_nodes= 0;

long ndb_connect_count= 0;



static int update_status_variables(Ndb_cluster_connection *c)

{
@@ -190,6 +192,8 @@ static int update_status_variables(Ndb_cluster_connection *c) 
  ndb_connected_host=          c->get_connected_host();

  ndb_number_of_replicas=      0;

  ndb_number_of_storage_nodes= c->no_db_nodes();

  ndb_number_of_ready_storage_nodes= c->get_no_ready();

  ndb_connect_count= c->get_connect_count();

  return 0;

}
@@ -7128,10 +7132,6 @@ void ndbcluster_real_free_share(NDB_SHARE **share) 
#ifndef DBUG_OFF

    bzero((gptr)(*share)->table_share, sizeof(*(*share)->table_share));

    bzero((gptr)(*share)->table, sizeof(*(*share)->table));

#endif

    my_free((gptr) (*share)->table_share, MYF(0));

    my_free((gptr) (*share)->table, MYF(0));

#ifndef DBUG_OFF

    (*share)->table_share= 0;

    (*share)->table= 0;

#endif
@@ -9361,11 +9361,15 @@ ndbcluster_show_status(THD* thd, stat_print_fn *stat_print, 
                "cluster_node_id=%u, "

                "connected_host=%s, "

                "connected_port=%u, "

                "number_of_storage_nodes=%u",

                "number_of_storage_nodes=%u, "

                "number_of_ready_storage_nodes=%u, "

                "connect_count=%u",

                ndb_cluster_node_id,

                ndb_connected_host,

                ndb_connected_port,

                ndb_number_of_storage_nodes);

                ndb_number_of_storage_nodes,

                ndb_number_of_ready_storage_nodes,

                ndb_connect_count);

  if (stat_print(thd, ndbcluster_hton.name, strlen(ndbcluster_hton.name),

                 "connection", strlen("connection"),

                 buf, buflen))

sql/ha_ndbcluster.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ typedef struct st_ndbcluster_share { 
  char *old_names; // for rename table

  TABLE_SHARE *table_share;

  TABLE *table;

  byte *record[2]; // pointer to allocated records for receiving data

  NdbValue *ndb_value[2];

  MY_BITMAP *subscriber_bitmap;

#endif