bk commit into 5.1 tree (patg:1.2252) BUG#19773

[Patrick Galbraith]

Below is the list of changes that have just been committed into a local
5.1 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.2252 06/07/07 11:17:50 patg@stripped +3 -0
  BUG #19773
  
  Small post-patch fixes

  sql/ha_federated.cc
    1.64 06/07/07 11:17:42 patg@stripped +5 -6
    BUG #19773
    
    method declartion and definition not the same.

  mysql-test/t/federated.test
    1.28 06/07/07 11:17:42 patg@stripped +0 -1
    BUG #19774
    
    Removed failing line to test.

  mysql-test/r/federated.result
    1.32 06/07/07 11:17:42 patg@stripped +4 -4
    BUG #19773
    
    Test result fixes

# 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.1-merge1

--- 1.31/mysql-test/r/federated.result	2006-07-06 16:07:20 -07:00
+++ 1.32/mysql-test/r/federated.result	2006-07-07 11:17:42 -07:00
@@ -1605,8 +1605,8 @@
 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.t2 (id int, c1 varchar(20), c2 varchar(20)) ENGINE=FEDERATED
CONNECTION='mysql://root@stripped:9308/federated/t2';
+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: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;
 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.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';
+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: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;

--- 1.27/mysql-test/t/federated.test	2006-07-06 16:07:20 -07:00
+++ 1.28/mysql-test/t/federated.test	2006-07-07 11:17:42 -07:00
@@ -1314,7 +1314,6 @@
 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

--- 1.63/sql/ha_federated.cc	2006-07-06 16:07:20 -07:00
+++ 1.64/sql/ha_federated.cc	2006-07-07 11:17:42 -07:00
@@ -416,7 +416,7 @@
 
   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 @@
 
 /* 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 @@
         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)