bk commit into 5.0 tree (patg:1.2237) BUG#18764

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.0 repository of patg. When patg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-18 18:41:36-07:00, patg@stripped +3 -0
  "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
  
  Post merge changes.

  mysql-test/r/federated.result@stripped, 2006-07-18 18:41:34-07:00, patg@stripped +0 -1
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

  mysql-test/t/federated.test@stripped, 2006-07-18 18:41:34-07:00, patg@stripped +0 -1
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

  sql/ha_federated.cc@stripped, 2006-07-18 18:41:34-07:00, patg@stripped +5 -2
    "BUG #18764: Delete conditions causing inconsistencies in Federated tables"
    
    Post merge changes.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	patg
# Host:	govinda.patg.net
# Root:	/home/patg/mysql-build/mysql-5.0-bug18764.2

--- 1.35/mysql-test/r/federated.result	2006-07-18 18:41:40 -07:00
+++ 1.36/mysql-test/r/federated.result	2006-07-18 18:41:40 -07:00
@@ -1727,7 +1727,6 @@
 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;

--- 1.31/mysql-test/t/federated.test	2006-07-18 18:41:40 -07:00
+++ 1.32/mysql-test/t/federated.test	2006-07-18 18:41:40 -07:00
@@ -1416,7 +1416,6 @@
 DROP TABLE federated.test_local;
 DROP TABLE federated.test_remote;
 --enable_warnings
-
 connection slave;
 --disable_warnings
 DROP TABLE federated.test;

--- 1.66/sql/ha_federated.cc	2006-07-18 18:41:40 -07:00
+++ 1.67/sql/ha_federated.cc	2006-07-18 18:41:40 -07:00
@@ -1589,8 +1589,11 @@
     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);