bk commit into 5.0 tree (patg:1.2212) BUG#19773

[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
  1.2212 06/06/28 12:18:21 patg@stripped +3 -0
  BUG #19773
  
  Pushbuild fixes to result file, test, and header file for federated.

  sql/ha_federated.h
    1.26 06/06/28 12:18:14 patg@stripped +2 -2
    BUG #19773
    
    HPUX and Windows failed with variable named row and *row in method declaration

  mysql-test/t/federated.test
    1.24 06/06/28 12:18:14 patg@stripped +2 -0
    BUG #19773
    
    Pushbuild fixes Test was missing --replace_result

  mysql-test/r/federated.result
    1.28 06/06/28 12:18:14 patg@stripped +2 -2
    BUG #19773
    
    Pushbuild fixes - result file had hard-coded port

# 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-engines-bug19773

--- 1.27/mysql-test/r/federated.result	2006-06-27 23:49:43 -07:00
+++ 1.28/mysql-test/r/federated.result	2006-06-28 12:18:14 -07:00
@@ -1605,7 +1605,7 @@
 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@stripped:9308/federated/t1';
+create table federated.t1 (i1 int, i2 int, i3 int) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:SLAVE_PORT/federated/t1';
 create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:9308/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");
@@ -1648,7 +1648,7 @@
 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@stripped:9308/federated/t1';
+create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary key
(i1)) ENGINE=FEDERATED CONNECTION='mysql://root@stripped: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@stripped:9308/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");

--- 1.23/mysql-test/t/federated.test	2006-06-27 23:49:43 -07:00
+++ 1.24/mysql-test/t/federated.test	2006-06-28 12:18:14 -07:00
@@ -1322,6 +1322,7 @@
 create table federated.t2 (id int, c1 varchar(20), c2 varchar(20));
 
 connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 eval create table federated.t1 (i1 int, i2 int, i3 int) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/federated/t1';
 eval create table federated.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/federated/t2';
 insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);
@@ -1344,6 +1345,7 @@
 create table federated.t2 (id int, c1 varchar(20), c2 varchar(20), primary key (id));
 
 connection master;
+--replace_result $SLAVE_MYPORT SLAVE_PORT
 eval create table federated.t1 (i1 int auto_increment not null, i2 int, i3 int, primary
key (i1)) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/federated/t1';
 eval create table federated.t2 (id int auto_increment not null, c1 varchar(20), c2
varchar(20), primary key(id)) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:$SLAVE_MYPORT/federated/t2';
 insert into federated.t1 values (1,5,10),(3,7,12),(4,5,2),(9,10,15),(2,2,2);

--- 1.25/sql/ha_federated.h	2006-06-27 23:49:43 -07:00
+++ 1.26/sql/ha_federated.h	2006-06-28 12:18:14 -07:00
@@ -165,8 +165,8 @@
       return errorcode otherwise
   */
   uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row,
-                                      MYSQL_RES *row);
-  bool create_where_from_key(String *to, KEY *key_info, 
+                                      MYSQL_RES *result);
+  bool create_where_from_key(String *to, KEY *key_info,
                              const key_range *start_key,
                              const key_range *end_key,
                              bool records_in_range);