bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3204)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedcfhg9ljua7

 3204 Magnus Blåudd	2009-11-08
      ha_ndbcluster
       - change return type of 'ndbcluster_disconnect' to void, it should
         never fail and return code is not used.

    modified:
      sql/ha_ndbcluster_connection.cc
      sql/ha_ndbcluster_connection.h
=== modified file 'sql/ha_ndbcluster_connection.cc'
--- a/sql/ha_ndbcluster_connection.cc	2009-11-08 17:59:42 +0000
+++ b/sql/ha_ndbcluster_connection.cc	2009-11-08 18:23:30 +0000
@@ -228,7 +228,7 @@ ndbcluster_connect_error:
   DBUG_RETURN(-1);
 }
 
-int ndbcluster_disconnect()
+void ndbcluster_disconnect(void)
 {
   DBUG_ENTER("ndbcluster_disconnect");
   if (g_ndb)
@@ -253,7 +253,7 @@ int ndbcluster_disconnect()
   if (g_ndb_cluster_connection)
     delete g_ndb_cluster_connection;
   g_ndb_cluster_connection= NULL;
-  DBUG_RETURN(0);
+  DBUG_VOID_RETURN;
 }
 
 Ndb_cluster_connection *ndb_get_cluster_connection()

=== modified file 'sql/ha_ndbcluster_connection.h'
--- a/sql/ha_ndbcluster_connection.h	2009-05-26 18:53:34 +0000
+++ b/sql/ha_ndbcluster_connection.h	2009-11-08 18:23:30 +0000
@@ -16,7 +16,7 @@
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 */
 int ndbcluster_connect(int (*connect_callback)(void));
-int ndbcluster_disconnect();
+void ndbcluster_disconnect(void);
 
 Ndb_cluster_connection *ndb_get_cluster_connection();
 ulonglong ndb_get_latest_trans_gci();

Attachment: [text/bzr-bundle] bzr/[e-mail]