bzr push into mysql-5.5-cluster-7.2 branch (magnus.blaudd:3917 to 3918)

[magnus.blaudd]

 3918 magnus.blaudd@stripped	2012-05-09
      ndb
       - Change ndbclient_exports.cpp to use a function instead of 'array of
         function pointers' since this is more flexible 
       - Add copyright header and comment

    modified:
      storage/ndb/src/ndbclient_exports.cpp
 3917 magnus.blaudd@stripped	2012-05-09
      ndb
       - rename src/dummy.cpp to src/ndbclient_exports.cpp since it's
         the file which contains the magic code controlling what goes into
         the shared ndbclient library

    renamed:
      storage/ndb/src/dummy.cpp => storage/ndb/src/ndbclient_exports.cpp
    modified:
      storage/ndb/src/CMakeLists.txt
=== modified file 'storage/ndb/src/ndbclient_exports.cpp'
--- a/storage/ndb/src/ndbclient_exports.cpp	2012-05-09 06:16:47 +0000
+++ b/storage/ndb/src/ndbclient_exports.cpp	2012-05-09 07:20:11 +0000
@@ -1,9 +1,32 @@
-#include "../include/ndbapi/NdbApi.hpp"
+/*
+   Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
 
-typedef void (Ndb_cluster_connection::* fptr)(const char*);
+/*
+  This source file is compiled into the shared ndbclient
+  in order to tell the linker which functions to export.
+
+  NOTE! _ndbclient_exports() is not intended to be called
+*/
+
+#include "../include/ndbapi/NdbApi.hpp"
 
-NDB_EXPORT fptr functions[] = {
-  (fptr)&Ndb_cluster_connection::set_name,
-  (fptr)&NdbScanFilter::isfalse,
-  0
-};
+void
+_ndbclient_exports(void)
+{
+  Ndb_cluster_connection cluster_connection;
+  NdbScanFilter scan_filter((NdbOperation*)0);
+}

No bundle (reason: useless for push emails).