List:Commits« Previous MessageNext Message »
From:magnus.blaudd Date:September 12 2012 2:24pm
Subject:bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4599 to 4600)
View as plain text  
 4600 magnus.blaudd@stripped	2012-09-12 [merge]
      Merge 7.0 -> 7.1

    modified:
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/t/ctype_cp932_binlog_stm.test
      sql/ha_ndb_index_stat.cc
      sql/ha_ndb_index_stat.h
      storage/ndb/include/util/NdbOut.hpp
      storage/ndb/src/mgmapi/LocalConfig.cpp
      storage/ndb/src/mgmapi/LocalConfig.hpp
      storage/ndb/test/include/NDBT_Stats.hpp
      storage/ndb/test/ndbapi/testRedo.cpp
 4599 Maitrayi Sabaratnam	2012-09-05 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/kernel/blocks/dbspj/DbspjMain.cpp
      storage/ndb/test/ndbapi/testDict.cpp
=== modified file 'mysql-test/r/ctype_cp932_binlog_stm.result'
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2012-02-13 12:23:55 +0000
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2012-09-12 11:28:45 +0000
@@ -45,7 +45,7 @@ master-bin.000001	#	Query	#	#	use `test`
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE t4
 End of 5.0 tests
 call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49");
-SHOW BINLOG EVENTS FROM 370;
+SHOW BINLOG EVENTS FROM 371;
 ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Wrong offset or I/O error
 Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
 CREATE TABLE t1 (a varchar(16)) character set cp932;

=== modified file 'mysql-test/t/ctype_cp932_binlog_stm.test'
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2012-02-13 12:23:55 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2012-09-12 11:28:45 +0000
@@ -30,13 +30,13 @@ delimiter ;|
 
 #
 # #28436: Incorrect position in SHOW BINLOG EVENTS causes server coredump 
-# Note: 370 (depends on FD event size changes) is a magic position (found experimentally, depends on
+# Note: 371 (depends on FD event size changes) is a magic position (found experimentally, depends on
 # the log's contents) that caused the server crash.
 
 call mtr.add_suppression("Error in Log_event::read_log_event\\\(\\\): 'Sanity check failed', data_len: 258, event_type: 49");
 
 --error 1220
-SHOW BINLOG EVENTS FROM 370;
+SHOW BINLOG EVENTS FROM 371;
 
 --echo Bug#44352 UPPER/LOWER function doesn't work correctly on cp932 and sjis environment.
 CREATE TABLE t1 (a varchar(16)) character set cp932;

=== modified file 'sql/ha_ndb_index_stat.cc'
--- a/sql/ha_ndb_index_stat.cc	2011-12-22 09:36:58 +0000
+++ b/sql/ha_ndb_index_stat.cc	2012-09-12 10:29:29 +0000
@@ -28,17 +28,15 @@
 extern struct st_ndb_status g_ndb_status;
 extern pthread_mutex_t ndbcluster_mutex;
 
-/* these have to live in ha_ndbcluster.cc */
+/* Implemented in ha_ndbcluster.cc */
 extern bool ndb_index_stat_get_enable(THD *thd);
 extern const char* g_ndb_status_index_stat_status;
 extern long g_ndb_status_index_stat_cache_query;
-extern long g_ndb_status_index_stat_cache_clean;
+extern long g_ndb_status_index_stat_cache_clean;        
 
 // Do we have waiter...
 static bool ndb_index_stat_waiter= false;
 
-// copied from ha_ndbcluster_binlog.h
-
 extern handlerton *ndbcluster_hton;
 
 inline
@@ -127,9 +125,9 @@ struct Ndb_index_stat_list {
 
 extern Ndb_index_stat_list ndb_index_stat_list[];
 
-time_t ndb_index_stat_time_now= 0;
+static time_t ndb_index_stat_time_now= 0;
 
-time_t
+static time_t
 ndb_index_stat_time()
 {
   time_t now= time(0);
@@ -153,9 +151,9 @@ ndb_index_stat_time()
   and after it exits.  This is only a pre-caution since mysqld
   should not allow clients at these times.
 */
-bool ndb_index_stat_allow_flag= false;
+static bool ndb_index_stat_allow_flag= false;
 
-bool
+static bool
 ndb_index_stat_allow(int flag= -1)
 {
   if (flag != -1)
@@ -167,7 +165,7 @@ ndb_index_stat_allow(int flag= -1)
 
 /* Options in string format buffer size */
 static const uint ndb_index_stat_option_sz= 512;
-void ndb_index_stat_opt2str(const struct Ndb_index_stat_opt&, char*);
+static void ndb_index_stat_opt2str(const struct Ndb_index_stat_opt&, char*);
 
 struct Ndb_index_stat_opt {
   enum Unit {
@@ -258,10 +256,10 @@ Ndb_index_stat_opt::Ndb_index_stat_opt(c
 static const uint ndb_index_stat_max_evict_batch = 32;
 
 char ndb_index_stat_option_buf[ndb_index_stat_option_sz];
-Ndb_index_stat_opt ndb_index_stat_opt(ndb_index_stat_option_buf);
+static Ndb_index_stat_opt ndb_index_stat_opt(ndb_index_stat_option_buf);
 
 /* Copy option struct to string buffer */
-void
+static void
 ndb_index_stat_opt2str(const Ndb_index_stat_opt& opt, char* str)
 {
   DBUG_ENTER("ndb_index_stat_opt2str");
@@ -343,7 +341,7 @@ ndb_index_stat_opt2str(const Ndb_index_s
   DBUG_VOID_RETURN;
 }
 
-int
+static int
 ndb_index_stat_option_parse(char* p, Ndb_index_stat_opt& opt)
 {
   DBUG_ENTER("ndb_index_stat_option_parse");
@@ -459,7 +457,7 @@ ndb_index_stat_option_parse(char* p, Ndb
 }
 
 /* Copy option string to option struct */
-int
+static int
 ndb_index_stat_str2opt(const char *str, Ndb_index_stat_opt& opt)
 {
   DBUG_ENTER("ndb_index_stat_str2opt");
@@ -502,7 +500,7 @@ ndb_index_stat_str2opt(const char *str, 
 /* Thanks to ha_innodb.cc */
 
 /* Need storage between check and update (assume locked) */
-char ndb_index_stat_option_tmp[ndb_index_stat_option_sz];
+static char ndb_index_stat_option_tmp[ndb_index_stat_option_sz];
  
 int
 ndb_index_stat_option_check(MYSQL_THD,
@@ -718,7 +716,7 @@ Ndb_index_stat_glob::zero_total()
   cache_high_bytes= cache_query_bytes + cache_clean_bytes;
 }
 
-Ndb_index_stat_glob ndb_index_stat_glob;
+static Ndb_index_stat_glob ndb_index_stat_glob;
 
 /* Shared index entries */
 
@@ -761,7 +759,7 @@ Ndb_index_stat::Ndb_index_stat()
   since they are probably local e.g. bad range (internal error).
   Argument "from" is 0=stats thread 1=client.
 */
-void
+static void
 ndb_index_stat_error(Ndb_index_stat *st,
                      int from, const char* place, int line)
 {
@@ -790,7 +788,7 @@ ndb_index_stat_error(Ndb_index_stat *st,
                             place, line, error.code, error.line, error.extra));
 }
 
-void
+static void
 ndb_index_stat_clear_error(Ndb_index_stat *st)
 {
   st->error.code= 0;
@@ -819,7 +817,7 @@ Ndb_index_stat_list ndb_index_stat_list[
   Ndb_index_stat_list(Ndb_index_stat::LT_Error,  "error")
 };
 
-void
+static void
 ndb_index_stat_list_add(Ndb_index_stat* st, int lt)
 {
   assert(st != 0 && st->lt == 0);
@@ -847,7 +845,7 @@ ndb_index_stat_list_add(Ndb_index_stat* 
   st->lt= lt;
 }
 
-void
+static void
 ndb_index_stat_list_remove(Ndb_index_stat* st)
 {
   assert(st != 0);
@@ -878,7 +876,7 @@ ndb_index_stat_list_remove(Ndb_index_sta
   st->list_prev= 0;
 }
 
-void
+static void
 ndb_index_stat_list_move(Ndb_index_stat *st, int lt)
 {
   assert(st != 0);
@@ -888,7 +886,7 @@ ndb_index_stat_list_move(Ndb_index_stat 
 
 /* Stats entry changes (must hold stat_mutex) */
 
-void
+static void
 ndb_index_stat_force_update(Ndb_index_stat *st, bool onoff)
 {
   safe_mutex_assert_owner(&ndb_index_stat_thread.stat_mutex);
@@ -915,7 +913,7 @@ ndb_index_stat_force_update(Ndb_index_st
   }
 }
 
-void
+static void
 ndb_index_stat_no_stats(Ndb_index_stat *st, bool flag)
 {
   safe_mutex_assert_owner(&ndb_index_stat_thread.stat_mutex);
@@ -938,7 +936,7 @@ ndb_index_stat_no_stats(Ndb_index_stat *
   }
 }
 
-void
+static void
 ndb_index_stat_ref_count(Ndb_index_stat *st, bool flag)
 {
   safe_mutex_assert_owner(&ndb_index_stat_thread.stat_mutex);
@@ -968,7 +966,7 @@ struct Ndb_index_stat_snap {
 };
 
 /* Subroutine, have lock */
-Ndb_index_stat*
+static Ndb_index_stat*
 ndb_index_stat_alloc(const NDBINDEX *index,
                      const NDBTAB *table,
                      int &err_out)
@@ -1001,7 +999,7 @@ ndb_index_stat_alloc(const NDBINDEX *ind
 }
 
 /* Subroutine, have lock */
-Ndb_index_stat*
+static Ndb_index_stat*
 ndb_index_stat_find_share(NDB_SHARE *share,
                           const NDBINDEX *index,
                           Ndb_index_stat *&st_last)
@@ -1024,7 +1022,7 @@ ndb_index_stat_find_share(NDB_SHARE *sha
 }
 
 /* Subroutine, have lock */
-void
+static void
 ndb_index_stat_add_share(NDB_SHARE *share,
                          Ndb_index_stat *st,
                          Ndb_index_stat *st_last)
@@ -1036,7 +1034,7 @@ ndb_index_stat_add_share(NDB_SHARE *shar
     st_last->share_next= st;
 }
 
-Ndb_index_stat*
+static Ndb_index_stat*
 ndb_index_stat_get_share(NDB_SHARE *share,
                          const NDBINDEX *index,
                          const NDBTAB *table,
@@ -1111,7 +1109,7 @@ ndb_index_stat_get_share(NDB_SHARE *shar
 */
 
 /* caller must hold stat_mutex */
-void
+static void
 ndb_index_stat_free(Ndb_index_stat *st)
 {
   safe_mutex_assert_owner(&ndb_index_stat_thread.stat_mutex);
@@ -1225,7 +1223,7 @@ ndb_index_stat_free(NDB_SHARE *share)
 
 /* Find entry across shares */
 /* wl4124_todo mutex overkill, hash table, can we find table share */
-Ndb_index_stat*
+static Ndb_index_stat*
 ndb_index_stat_find_entry(int index_id, int index_version, int table_id)
 {
   DBUG_ENTER("ndb_index_stat_find_entry");
@@ -1258,7 +1256,7 @@ ndb_index_stat_find_entry(int index_id, 
 
 /* Statistics thread sub-routines */
 
-void
+static void
 ndb_index_stat_cache_move(Ndb_index_stat *st)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1283,7 +1281,7 @@ ndb_index_stat_cache_move(Ndb_index_stat
     glob.cache_high_bytes= cache_total;
 }
 
-bool
+static bool
 ndb_index_stat_cache_clean(Ndb_index_stat *st)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1303,7 +1301,7 @@ ndb_index_stat_cache_clean(Ndb_index_sta
   return true;
 }
 
-void
+static void
 ndb_index_stat_cache_evict(Ndb_index_stat *st)
 {
   NdbIndexStat::Head head;
@@ -1356,7 +1354,7 @@ struct Ndb_index_stat_proc {
   {}
 };
 
-void
+static void
 ndb_index_stat_proc_new(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   assert(st->error.code == 0);
@@ -1366,7 +1364,7 @@ ndb_index_stat_proc_new(Ndb_index_stat_p
     pr.lt= Ndb_index_stat::LT_Read;
 }
 
-void
+static void
 ndb_index_stat_proc_new(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1388,7 +1386,7 @@ ndb_index_stat_proc_new(Ndb_index_stat_p
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_proc_update(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   if (st->is->update_stat(pr.ndb) == -1)
@@ -1414,7 +1412,7 @@ ndb_index_stat_proc_update(Ndb_index_sta
   pr.lt= Ndb_index_stat::LT_Read;
 }
 
-void
+static void
 ndb_index_stat_proc_update(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1443,7 +1441,7 @@ ndb_index_stat_proc_update(Ndb_index_sta
     pr.busy= true;
 }
 
-void
+static void
 ndb_index_stat_proc_read(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1492,7 +1490,7 @@ ndb_index_stat_proc_read(Ndb_index_stat_
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_proc_read(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1521,7 +1519,7 @@ ndb_index_stat_proc_read(Ndb_index_stat_
     pr.busy= true;
 }
 
-void
+static void
 ndb_index_stat_proc_idle(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1575,7 +1573,7 @@ ndb_index_stat_proc_idle(Ndb_index_stat_
   pr.lt= Ndb_index_stat::LT_Idle;
 }
 
-void
+static void
 ndb_index_stat_proc_idle(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1618,7 +1616,7 @@ ndb_index_stat_proc_idle(Ndb_index_stat_
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_proc_check(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   pr.now= ndb_index_stat_time();
@@ -1655,7 +1653,7 @@ ndb_index_stat_proc_check(Ndb_index_stat
   pr.lt= Ndb_index_stat::LT_Idle;
 }
 
-void
+static void
 ndb_index_stat_proc_check(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1685,7 +1683,7 @@ ndb_index_stat_proc_check(Ndb_index_stat
 }
 
 /* Check if need to evict more */
-bool
+static bool
 ndb_index_stat_proc_evict()
 {
   const Ndb_index_stat_opt &opt= ndb_index_stat_opt;
@@ -1704,7 +1702,7 @@ ndb_index_stat_proc_evict()
 }
 
 /* Check if st1 is better or as good to evict than st2 */
-bool
+static bool
 ndb_index_stat_evict(const Ndb_index_stat *st1,
                      const Ndb_index_stat *st2)
 {
@@ -1717,7 +1715,7 @@ ndb_index_stat_evict(const Ndb_index_sta
   return false;
 }
 
-void
+static void
 ndb_index_stat_proc_evict(Ndb_index_stat_proc &pr, int lt)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1827,14 +1825,14 @@ ndb_index_stat_proc_evict(Ndb_index_stat
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_proc_evict(Ndb_index_stat_proc &pr)
 {
   ndb_index_stat_proc_evict(pr, Ndb_index_stat::LT_Error);
   ndb_index_stat_proc_evict(pr, Ndb_index_stat::LT_Idle);
 }
 
-void
+static void
 ndb_index_stat_proc_delete(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1888,7 +1886,7 @@ ndb_index_stat_proc_delete(Ndb_index_sta
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_proc_error(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   const Ndb_index_stat_opt &opt= ndb_index_stat_opt;
@@ -1923,7 +1921,7 @@ ndb_index_stat_proc_error(Ndb_index_stat
   pr.lt= Ndb_index_stat::LT_Error;
 }
 
-void
+static void
 ndb_index_stat_proc_error(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -1954,7 +1952,7 @@ ndb_index_stat_proc_error(Ndb_index_stat
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_proc_event(Ndb_index_stat_proc &pr, Ndb_index_stat *st)
 {
   /*
@@ -1986,7 +1984,7 @@ ndb_index_stat_proc_event(Ndb_index_stat
   }
 }
 
-void
+static void
 ndb_index_stat_proc_event(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -2054,7 +2052,7 @@ ndb_index_stat_proc_event(Ndb_index_stat
 
 /* Control options */
 
-void
+static void
 ndb_index_stat_proc_control(Ndb_index_stat_proc &pr)
 {
   Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -2072,7 +2070,7 @@ ndb_index_stat_proc_control(Ndb_index_st
 }
 
 #ifndef DBUG_OFF
-void
+static void
 ndb_index_stat_entry_verify(Ndb_index_stat_proc &pr, const Ndb_index_stat *st)
 {
   const NDB_SHARE *share= st->share;
@@ -2110,7 +2108,7 @@ ndb_index_stat_entry_verify(Ndb_index_st
   pr.cache_clean_bytes+= st->clean_bytes;
 }
 
-void
+static void
 ndb_index_stat_list_verify(Ndb_index_stat_proc &pr, int lt)
 {
   const Ndb_index_stat_list &list= ndb_index_stat_list[lt];
@@ -2161,7 +2159,7 @@ ndb_index_stat_list_verify(Ndb_index_sta
   assert(count == list.count);
 }
 
-void
+static void
 ndb_index_stat_list_verify(Ndb_index_stat_proc &pr)
 {
   const Ndb_index_stat_glob &glob= ndb_index_stat_glob;
@@ -2177,7 +2175,7 @@ ndb_index_stat_list_verify(Ndb_index_sta
   pthread_mutex_unlock(&ndb_index_stat_thread.stat_mutex);
 }
 
-void
+static void
 ndb_index_stat_report(const Ndb_index_stat_glob& old_glob)
 {
   const Ndb_index_stat_glob &new_glob= ndb_index_stat_glob;
@@ -2192,7 +2190,7 @@ ndb_index_stat_report(const Ndb_index_st
 }
 #endif
 
-void
+static void
 ndb_index_stat_proc(Ndb_index_stat_proc &pr)
 {
   DBUG_ENTER("ndb_index_stat_proc");
@@ -2262,7 +2260,7 @@ ndb_index_stat_end()
 
 /* Index stats thread */
 
-int
+static int
 ndb_index_stat_check_or_create_systables(Ndb_index_stat_proc &pr)
 {
   DBUG_ENTER("ndb_index_stat_check_or_create_systables");
@@ -2297,7 +2295,7 @@ ndb_index_stat_check_or_create_systables
   DBUG_RETURN(-1);
 }
 
-int
+static int
 ndb_index_stat_check_or_create_sysevents(Ndb_index_stat_proc &pr)
 {
   DBUG_ENTER("ndb_index_stat_check_or_create_sysevents");
@@ -2330,7 +2328,7 @@ ndb_index_stat_check_or_create_sysevents
   DBUG_RETURN(-1);
 }
 
-int
+static int
 ndb_index_stat_start_listener(Ndb_index_stat_proc &pr)
 {
   DBUG_ENTER("ndb_index_stat_start_listener");
@@ -2355,7 +2353,7 @@ ndb_index_stat_start_listener(Ndb_index_
   DBUG_RETURN(0);
 }
 
-int
+static int
 ndb_index_stat_stop_listener(Ndb_index_stat_proc &pr)
 {
   DBUG_ENTER("ndb_index_stat_stop_listener");
@@ -2666,7 +2664,7 @@ ndb_index_stat_round(double x)
   similar but separated for clarity.
 */
 
-int
+static int
 ndb_index_stat_wait_query(Ndb_index_stat *st,
                           const Ndb_index_stat_snap &snap)
 {
@@ -2754,7 +2752,7 @@ ndb_index_stat_wait_query(Ndb_index_stat
   DBUG_RETURN(0);
 }
 
-int
+static int
 ndb_index_stat_wait_analyze(Ndb_index_stat *st,
                             const Ndb_index_stat_snap &snap)
 {

=== modified file 'sql/ha_ndb_index_stat.h'
--- a/sql/ha_ndb_index_stat.h	2011-12-18 12:20:44 +0000
+++ b/sql/ha_ndb_index_stat.h	2012-09-12 10:29:29 +0000
@@ -56,15 +56,9 @@ private:
 };
 
 /* free entries from share or at end */
-extern void ndb_index_stat_free(NDB_SHARE*, int iudex_id, int index_version);
-extern void ndb_index_stat_free(NDB_SHARE*);
-extern void ndb_index_stat_end();
-
-/* these have to live in ha_ndbcluster.cc */
-extern bool ndb_index_stat_get_enable(THD *thd);
-extern const char* g_ndb_status_index_stat_status;
-extern long g_ndb_status_index_stat_cache_query;
-extern long g_ndb_status_index_stat_cache_clean;
+void ndb_index_stat_free(NDB_SHARE*, int iudex_id, int index_version);
+void ndb_index_stat_free(NDB_SHARE*);
+void ndb_index_stat_end();
 
 void
 compute_index_bounds(NdbIndexScanOperation::IndexBound & bound,

=== modified file 'storage/ndb/include/util/NdbOut.hpp'
--- a/storage/ndb/include/util/NdbOut.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/include/util/NdbOut.hpp	2012-09-06 11:32:26 +0000
@@ -93,11 +93,6 @@ private:
   bool m_autoflush;
 };
 
-#ifdef NDB_WIN
-typedef int(*NdbOutF)(char*);
-extern NdbOutF ndbout_svc;
-#endif
-
 inline NdbOut& NdbOut::operator<<(NdbOut& (* _f)(NdbOut&)) {
   (* _f)(*this); 
   return * this; 

=== modified file 'storage/ndb/src/mgmapi/LocalConfig.cpp'
--- a/storage/ndb/src/mgmapi/LocalConfig.cpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/mgmapi/LocalConfig.cpp	2012-09-12 08:41:46 +0000
@@ -117,31 +117,6 @@ void LocalConfig::setError(int lineNumbe
   strncpy(error_msg, _msg, sizeof(error_msg));
 }
 
-void LocalConfig::printError() const {
-  ndbout << "Configuration error" << endl;
-  if (error_line)
-    ndbout << "Line: "<< error_line << ", ";
-  ndbout << error_msg << endl << endl;
-}
-
-void LocalConfig::printUsage() const {
-  ndbout << "This node needs information on how to connect"<<endl
-	 << "to the NDB Management Server."<<endl
-	 << "The information can be supplied in one of the following ways:"
-	 << endl;
-    
-  ndbout << "1. Put a Ndb.cfg file in the directory where you start"<<endl 
-	 << "   the node. "<< endl
-	 << "   Ex: Ndb.cfg" << endl
-	 << "   | host=localhost:"<<NDB_PORT<<endl;
-    
-  ndbout << "2. Use the environment variable NDB_CONNECTSTRING to "<<endl
-	 << "   provide this information." <<endl
-	 << "   Ex: " << endl
-	 << "   >export NDB_CONNECTSTRING=\"host=localhost:"<<NDB_PORT<<"\""
-	 <<endl<<endl;
-}
-  
 const char *nodeIdTokens[] = {
   "OwnProcessId %i",
   "nodeid=%i",

=== modified file 'storage/ndb/src/mgmapi/LocalConfig.hpp'
--- a/storage/ndb/src/mgmapi/LocalConfig.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/src/mgmapi/LocalConfig.hpp	2012-09-12 08:41:46 +0000
@@ -55,9 +55,6 @@ struct LocalConfig {
   bool init(const char *connectString = 0,
 	    const char *fileName = 0);
 
-  void printError() const;
-  void printUsage() const;
-
   void setError(int lineNumber, const char * _msg);
   bool readConnectString(const char *, const char *info);
   bool readFile(const char * file, bool &fopenError);

=== modified file 'storage/ndb/test/include/NDBT_Stats.hpp'
--- a/storage/ndb/test/include/NDBT_Stats.hpp	2011-06-30 15:59:25 +0000
+++ b/storage/ndb/test/include/NDBT_Stats.hpp	2012-09-06 07:24:56 +0000
@@ -59,20 +59,4 @@ private:
   double min, max;
 };
 
-inline
-double
-NDB_SQRT(double x){
-  assert(x >= 0);
-
-  double y = 0;
-  double s = 1;
-  double r = 0;
-  while(y <= x){
-    y += s;
-    s += 2;
-    r += 1;
-  }
-  return r - 1;
-}
-
 #endif

=== modified file 'storage/ndb/test/ndbapi/testRedo.cpp'
--- a/storage/ndb/test/ndbapi/testRedo.cpp	2012-08-13 13:03:29 +0000
+++ b/storage/ndb/test/ndbapi/testRedo.cpp	2012-09-12 09:12:03 +0000
@@ -25,8 +25,6 @@
 #include <NDBT_Stats.hpp>
 #include <random.h>
 
-#include "storage/ndb/src/mgmapi/mgmapi_configuration.hpp"
-
 static NdbMutex* g_msgmutex = 0;
 
 #undef require

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.1 branch (magnus.blaudd:4599 to 4600) magnus.blaudd13 Sep