Commit 9378fc62 authored by unknown's avatar unknown
Browse files

"BUG #18764: Delete conditions causing inconsistencies in Federated tables" 

Post merge changes.
parent 6ab68cdf

mysql-test/r/federated.result

+0 −1
Original line number Diff line number Diff line
@@ -1727,7 +1727,6 @@ id val1 val2 
DROP TABLE federated.test_local;

DROP TABLE federated.test_remote;

DROP TABLE federated.test;



drop table if exists federated.t1;

create table federated.t1 (a int, b int, c int);

drop table if exists federated.t1;

mysql-test/t/federated.test

+0 −1
Original line number Diff line number Diff line
@@ -1416,7 +1416,6 @@ select * from federated.test_remote; 
DROP TABLE federated.test_local;

DROP TABLE federated.test_remote;

--enable_warnings



connection slave;

--disable_warnings

DROP TABLE federated.test;

sql/ha_federated.cc

+5 −2
Original line number Diff line number Diff line
@@ -1589,8 +1589,11 @@ int ha_federated::write_row(byte *buf) 
    else

    {

      (*field)->val_str(&insert_field_value_string);

      /* quote these fields if they require it */

      (*field)->quote_data(&insert_field_value_string);

      values_string.append('\'');

      insert_field_value_string.print(&values_string);

      values_string.append('\'');



      insert_field_value_string.length(0);

    }

    /* append the field name */

    insert_string.append((*field)->field_name);