diff options
| author | unknown <patg@govinda.patg.net> | 2006-07-18 18:41:36 -0700 |
|---|---|---|
| committer | unknown <patg@govinda.patg.net> | 2006-07-18 18:41:36 -0700 |
| commit | 9378fc627ecaf22d47bfd0de1c192953c96d5159 (patch) | |
| tree | 229a2ce3e99bc8942c5e18754027df5b75f435e0 | |
| parent | 6ab68cdf2967bf279120305c6cf625cdd31ba7e7 (diff) | |
| download | mariadb-git-9378fc627ecaf22d47bfd0de1c192953c96d5159.tar.gz | |
"BUG #18764: Delete conditions causing inconsistencies in Federated tables"
Post merge changes.
| -rw-r--r-- | mysql-test/r/federated.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/federated.test | 1 | ||||
| -rw-r--r-- | sql/ha_federated.cc | 7 |
3 files changed, 5 insertions, 4 deletions
diff --git a/mysql-test/r/federated.result b/mysql-test/r/federated.result index e975f94baab..5d17afd8cfc 100644 --- a/mysql-test/r/federated.result +++ b/mysql-test/r/federated.result @@ -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; diff --git a/mysql-test/t/federated.test b/mysql-test/t/federated.test index bed168f5b8f..38beab605fd 100644 --- a/mysql-test/t/federated.test +++ b/mysql-test/t/federated.test @@ -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; diff --git a/sql/ha_federated.cc b/sql/ha_federated.cc index 0012e4ba131..2267c2b5d79 100644 --- a/sql/ha_federated.cc +++ b/sql/ha_federated.cc @@ -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); |