From: magnus.blaudd
Date: May 31 2011 2:38pm
Subject: bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:4434)
List-Archive: http://lists.mysql.com/commits/138464
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0416112163603543514=="

--===============0416112163603543514==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///data0/magnus/mysql/7.0/ based on revid:jonas@stripped

 4434 magnus.blaudd@stripped	2011-05-31
      ndb
       - mark ndbcluster_find_files() as static and remove it from header file

    modified:
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
=== modified file 'sql/ha_ndbcluster.cc'
--- a/sql/ha_ndbcluster.cc	2011-04-29 11:45:56 +0000
+++ b/sql/ha_ndbcluster.cc	2011-05-31 14:38:10 +0000
@@ -10533,10 +10533,11 @@ int ndbcluster_find_all_files(THD *thd)
   DBUG_RETURN(-(skipped + unhandled));
 }
 
-int ndbcluster_find_files(handlerton *hton, THD *thd,
-                          const char *db,
-                          const char *path,
-                          const char *wild, bool dir, List<LEX_STRING> *files)
+
+static int
+ndbcluster_find_files(handlerton *hton, THD *thd,
+                      const char *db, const char *path,
+                      const char *wild, bool dir, List<LEX_STRING> *files)
 {
   DBUG_ENTER("ndbcluster_find_files");
   DBUG_PRINT("enter", ("db: %s", db));
@@ -10902,7 +10903,7 @@ static int ndbcluster_init(void *p)
     ndbcluster_binlog_init_handlerton();
     h->flags=            HTON_CAN_RECREATE | HTON_TEMPORARY_NOT_SUPPORTED;
     h->discover=         ndbcluster_discover;
-    h->find_files= ndbcluster_find_files;
+    h->find_files=       ndbcluster_find_files;
     h->table_exists_in_engine= ndbcluster_table_exists_in_engine;
   }
 

=== modified file 'sql/ha_ndbcluster.h'
--- a/sql/ha_ndbcluster.h	2011-04-29 09:06:21 +0000
+++ b/sql/ha_ndbcluster.h	2011-05-31 14:38:10 +0000
@@ -885,8 +885,6 @@ private:
 
 int ndbcluster_discover(THD* thd, const char* dbname, const char* name,
                         const void** frmblob, uint* frmlen);
-int ndbcluster_find_files(THD *thd,const char *db,const char *path,
-                          const char *wild, bool dir, List<LEX_STRING> *files);
 int ndbcluster_table_exists_in_engine(THD* thd,
                                       const char *db, const char *name);
 void ndbcluster_print_error(int error, const NdbOperation *error_op);


--===============0416112163603543514==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   81kyoy1ezotxpqqq
# target_branch: file:///data0/magnus/mysql/7.0/
# testament_sha1: 18c72ad25b7a456e2fa55eeaa09f2c81d574e8ab
# timestamp: 2011-05-31 16:38:56 +0200
# base_revision_id: jonas@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc9Eg+UAAhN/gEgQEABQd///
VuUcQL////BQBM15oAtlSktZowkkiaeiGRT8FNPFR5ppTR6jxTQNpPJqbSDmAAmTAAmEwTCGAIwA
JTUTAqYajT1MQABoAADIDQ5gAJkwAJhMEwhgCMACSQgNGgEnomBTNNKbUeo9T1AGj1DSEnLI9LuX
8OVPfpK5zhijhtgywaBWsjxuMkGV2hoPSF04mXAiujDndyqG0eJwiSZKPsX7KouWGFj7XvHkFixk
lLpE3Oao5+0VnKSLbQPjcRMurBnmuyZOlBPqNz7kQMgsOLcuzxXxw4P+U1xOXoW0vAfE/kK9sOHE
3yKU/OsxSMFvJJkDlgSjA0IAeDKSBt24QPytCIPMEUOZi5NrZYCxCjnIkJEwe2ChSNYdP3baVY8G
bDlED1rQp0dxLnJCzSL4TOKFNNm2NftoEMApAgNE+LOZZQGys76hxbUPL9wDwvMgPrm53UIMhcql
vLiWe5GsCE6JyioY4HRYxo77EiG7BnvdQWwo3qbEpeb3lAHKm7rAeUGnM4XX2fBkakSPEMkMDBwH
Gx4EBiI2hiW6clOQqoLWMpltXQ/xOPAts3uIrvveniWo2ZfeOnRgeGWtAU15m2aXKwkt59a9aHRL
3Y3kJtvjQUU5UwTLMmHXGNuJIrtx0Xc/M8fUlmZzSDe6DLPXIHmhoV+JAyjWZJwzgOQEaww8qS/N
RH5q+3CBeSpZ7RgrrWcOjOUleJdBxOMwreyXpqNGcznOZSQKKsabEZLc4+pnOvUSRtJUavycu6NY
kiR7MmZuXnBz6f3r0t6w9oPXJ2lD8KmsmS9hZdYByHBzGGGFP79PM87EiYi5RZH5pHpIkoZWhTWl
TChOHtQdkj54nmY3OI5Ewj1b0PvSLvXKtiVBEuPA+hITQlI7eQ6CVaDHvtKDH48JjjLopWVzJFiC
0S0+J2vm5mVfHW4uY157DCwqCicHWTIzSIEetTkEryuStIqWpUvy/edezIVT2tKBxKa4ovKkuNpg
UyEbOjHoptMusYutxTMfovr8s0jS53HgFaYOeQmbNl04bBb6ylE6LRw/MFy9yRb2NScnB0Fx7gzK
fOSauJYON5tZHX/F5bEfNrx0peLOMkUFhBucx2rwbULzuGY6Qp80vQqrDEGnW4anJpQ0OpeBu0BQ
JdkPCx+HDCGaORZ5I/arrOXUKRWu7NqAyR2UDA8gPt80bQkiTg9EjqvEJJDEzGjIgYV179740Fqx
TMyFUczYmHFlSzEUMxp+B3GLwKnvVDQaWlqJu9NfE0wsYJ7o0MemMpcm6eBgINDCMkEKQ5bDdPSP
e3eksB6KVhCr4itIxokXFykeBH7D0Ad5Cka7mGD0mVWws6wPyAo6zpbpDupJHUiQAYDguDYOBXJG
KZGuU6V3J6/Ep6T5FSwPcy7MraErhNV7ZGYoOHtS59s01TEwiJ0IzGZJSNiqwVTtppswQSFRfeqn
xXzITQNgPR0c4WDKwN/Ap49h21j5XkR3tFEgewYUgXcDJG6xIfVSkXoOwypHFUFqjtEtIGLy9/ds
AqKkcTk4rUAHlgGC0qImoqWRQoL1/xdyRThQkM9Eg+U=


--===============0416112163603543514==--