bk commit into 5.1 tree (patg:1.1954) BUG#15559

[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.1954 05/12/07 12:58:04 patg@stripped +1 -0
  BUG #15559
  
  Fixed logic in handler to make handler now show up as enabled.

  sql/ha_federated.cc
    1.45 05/12/07 12:57:55 patg@stripped +2 -2
    BUG# 15559
    
    Fixed logic in federated_db_init. Also, the query length was being chopped 
    too much breaking the initial select query.

# 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:	krsna.patg.net
# Root:	/home/patg/mysql-build/mysql-5.1-new2

--- 1.44/sql/ha_federated.cc	2005-11-23 18:08:01 -08:00
+++ 1.45/sql/ha_federated.cc	2005-12-07 12:57:55 -08:00
@@ -432,7 +432,7 @@
   DBUG_ENTER("federated_db_init");
   if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
     goto error;
-  if (hash_init(&federated_open_tables, system_charset_info, 32, 0, 0,
+  if (!hash_init(&federated_open_tables, system_charset_info, 32, 0, 0,
                     (hash_get_key) federated_get_key, 0, 0))
   {
     federated_init= TRUE;
@@ -1343,7 +1343,7 @@
       query.append(FEDERATED_BTICK);
       query.append(FEDERATED_COMMA);
     }
-    query.length(query.length()- FEDERATED_COMMA_LEN);
+    query.length(query.length()- (FEDERATED_COMMA_LEN - 1));
     query.append(FEDERATED_FROM);
     query.append(FEDERATED_BTICK);