Commit 8f107a26 authored by unknown's avatar unknown
Browse files

BUG #19773 

Small post-patch fixes


mysql-test/r/federated.result:
  BUG #19773
  
  Test result fixes
mysql-test/t/federated.test:
  BUG #19774
  
  Removed failing line to test.
sql/ha_federated.cc:
  BUG #19773
  
  method declartion and definition not the same.
parent 650e6504

mysql-test/r/federated.result

+4 −4
Original line number Diff line number Diff line
@@ -1605,8 +1605,8 @@ DROP TABLE federated.t1; 
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:9308/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.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: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;
@@ -1648,8 +1648,8 @@ drop table federated.t1, federated.t2; 
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:9308/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.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: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

+0 −1
Original line number Diff line number Diff line
@@ -1314,7 +1314,6 @@ select * from federated.t1 where fld_parentid=0 and fld_delt=0; 
DROP TABLE federated.t1;

connection slave;

DROP TABLE federated.bug_17377_table;

DROP TABLE federated.t1;



#

# BUG 19773 Crash when using multi-table updates, deletes

sql/ha_federated.cc

+5 −6
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ int federated_db_init() 


  if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))

    goto error;

  if (hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,

  if (!hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,

                    (hash_get_key) federated_get_key, 0, 0))

  {

    federated_init= TRUE;
@@ -2114,7 +2114,7 @@ int ha_federated::index_read_idx_with_result_set(byte *buf, uint index, 


/* Initialized at each key walk (called multiple times unlike rnd_init()) */



int ha_federated::index_init(uint keynr)

int ha_federated::index_init(uint keynr, bool sorted)

{

  DBUG_ENTER("ha_federated::index_init");

  DBUG_PRINT("info", ("table: '%s'  key: %u", table->s->table_name, keynr));
@@ -2523,14 +2523,13 @@ void ha_federated::info(uint flag) 
        stats.check_time=      (ha_rows) my_strtoll10(row[13], (char**) 0,

                                                      &error);

    }

    if (flag & HA_STATUS_CONST)

      stats.block_size= 4096;



    /*

      size of IO operations (This is based on a good guess, no high science

      involved)

    */

    block_size= 4096;

    if (flag & HA_STATUS_CONST)

      stats.block_size= 4096;



  }



  if (result)