after merge fixes

monty@mysql.com/narttu.mysql.fi · monty@mysql.com/narttu.mysql.fi · commit 1f6d91c5a631 · 2007-01-29T16:13:18.000+02:00
Removed
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
@@ -39,4 +39,4 @@ synchronization          : Bug#24529  	Test 'synchronization' fails on Mac pushb
 flush2                   : Bug#24805 Pushbuild can't handle test with --disable-log-bin
 mysql_upgrade            : Bug#25074 mysql_upgrade gives inconsisten results
 plugin                   : Bug#25659 memory leak via "plugins" test
-
+rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly
diff --git a/mysql-test/t/rpl_ndb_dd_advance.test b/mysql-test/t/rpl_ndb_dd_advance.test
@@ -9,6 +9,7 @@
 --source include/have_binlog_format_row.inc
 --source include/ndb_default_cluster.inc
 --source include/not_embedded.inc
+--source include/big_test.inc
 #--source include/have_ndb_extra.inc
 --source include/master-slave.inc
 
diff --git a/plugin/daemon_example/daemon_example.c b/plugin/daemon_example/daemon_example.c
@@ -40,7 +40,7 @@
     1                    failure (cannot happen)
 */
 
-static int daemon_example_plugin_init(void *p)
+static int daemon_example_plugin_init(void *p __attribute__ ((unused)))
 {
   return(0);
 }
@@ -59,7 +59,7 @@ static int daemon_example_plugin_init(void *p)
 
 */
 
-static int daemon_example_plugin_deinit(void *p)
+static int daemon_example_plugin_deinit(void *p __attribute__ ((unused)))
 {
   return(0);
 }
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
@@ -896,7 +896,7 @@ longlong Item_in_optimizer::val_int()
           */
           for (i= 0; i < ncols; i++)
           {
-            if (cache->el(i)->null_value)
+            if (cache->element_index(i)->null_value)
               item_subs->set_cond_guard_var(i, FALSE);
           }
           
@@ -1020,8 +1020,10 @@ longlong Item_func_strcmp::val_int()
 
 void Item_func_interval::fix_length_and_dec()
 {
-  use_decimal_comparison= (row->element_index(0)->result_type() == DECIMAL_RESULT) ||
-    (row->element_index(0)->result_type() == INT_RESULT);
+  use_decimal_comparison= ((row->element_index(0)->result_type() ==
+                            DECIMAL_RESULT) ||
+                           (row->element_index(0)->result_type() ==
+                            INT_RESULT));
   if (row->cols() > 8)
   {
     bool consts=1;
diff --git a/sql/item_subselect.cc b/sql/item_subselect.cc
@@ -1259,7 +1259,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
                                       (char *)"<list ref>")
                             );
       Item *col_item= new Item_cond_or(item_eq, item_isnull);
-      if (!abort_on_null && left_expr->el(i)->maybe_null)
+      if (!abort_on_null && left_expr->element_index(i)->maybe_null)
       {
         if (!(col_item= new Item_func_trig_cond(col_item, get_cond_guard(i))))
           DBUG_RETURN(RES_ERROR);
@@ -1273,7 +1273,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
                                                 ref_pointer_array + i,
                                                 (char *)"<no matter>",
                                                 (char *)"<list ref>"));
-      if (!abort_on_null && left_expr->el(i)->maybe_null)
+      if (!abort_on_null && left_expr->element_index(i)->maybe_null)
       {
         if (!(item_nnull_test= 
               new Item_func_trig_cond(item_nnull_test, get_cond_guard(i))))
@@ -1350,7 +1350,7 @@ Item_in_subselect::row_value_transformer(JOIN *join)
           TODO: why we create the above for cases where the right part
                 cant be NULL?
         */
-        if (left_expr->el(i)->maybe_null)
+        if (left_expr->element_index(i)->maybe_null)
         {
           if (!(item= new Item_func_trig_cond(item, get_cond_guard(i))))
             DBUG_RETURN(RES_ERROR);
@@ -1801,7 +1801,6 @@ int subselect_single_select_engine::exec()
   if (!executed)
   {
     item->reset_value_registration();
-    bool have_changed_access= FALSE;
     JOIN_TAB *changed_tabs[MAX_TABLES];
     JOIN_TAB **last_changed_tab= changed_tabs;
     if (item->have_guarded_conds())
diff --git a/storage/ndb/src/common/util/ConfigValues.cpp b/storage/ndb/src/common/util/ConfigValues.cpp
@@ -18,8 +18,6 @@
 #include <NdbOut.hpp>
 #include <NdbTCP.h>
 
-static Uint32 hash(Uint32 key, Uint32 size);
-static Uint32 nextHash(Uint32 key, Uint32 size, Uint32 pos, Uint32 count);
 static bool findKey(const Uint32 * vals, Uint32 sz, Uint32 key, Uint32 * pos);
 
 /**
diff --git a/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp b/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
@@ -40,6 +40,8 @@ usage()
     << "Example: " << progname << " -ceq ndb_*_fs/D[12]/DBDICT/P0.SchemaLog" << endl;
 }
 
+#ifdef NOT_USED
+
 static void
 fill(const char * buf, int mod)
 {
@@ -50,6 +52,7 @@ fill(const char * buf, int mod)
     len++;
   }
 }
+#endif
 
 static const char*
 version(Uint32 v)
diff --git a/storage/ndb/src/kernel/blocks/lgman.cpp b/storage/ndb/src/kernel/blocks/lgman.cpp
@@ -133,10 +133,6 @@ void
 Lgman::execSTTOR(Signal* signal) 
 {
   jamEntry();                            
-
-  const Uint32 startphase  = signal->theData[1];
-  const Uint32 typeOfStart = signal->theData[7];
-
   sendSTTORRY(signal);
   
   return;
@@ -274,7 +270,6 @@ Lgman::execDUMP_STATE_ORD(Signal* signal){
 		!ptr.p->m_log_sync_waiters.isEmpty());
       if (!ptr.p->m_log_buffer_waiters.isEmpty())
       {
-	Uint32 free_buffer= ptr.p->m_free_buffer_words;
 	Ptr<Log_waiter> waiter;
 	Local_log_waiter_list 
 	  list(m_log_waiter_pool, ptr.p->m_log_buffer_waiters);
@@ -1937,8 +1932,7 @@ void
 Lgman::execSUB_GCP_COMPLETE_REP(Signal* signal)
 {
   jamEntry();
-  Uint32 gci= ((SubGcpCompleteRep*)signal->getDataPtr())->gci;
-  
+
   Ptr<Logfile_group> ptr;
   m_logfile_group_list.first(ptr);
 
diff --git a/storage/ndb/src/kernel/blocks/pgman.cpp b/storage/ndb/src/kernel/blocks/pgman.cpp
@@ -471,7 +471,6 @@ Pgman::lirs_stack_prune()
   debugOut << "PGMAN: >lirs_stack_prune" << endl;
 #endif
   Page_stack& pl_stack = m_page_stack;
-  Page_queue& pl_queue = m_page_queue;
   Ptr<Page_entry> ptr;
 
   while (pl_stack.first(ptr))      // first is stack bottom
@@ -804,7 +803,6 @@ Pgman::process_bind(Signal* signal, Ptr<Page_entry> ptr)
 #ifdef VM_TRACE
   debugOut << "PGMAN: " << ptr << " : process_bind" << endl;
 #endif
-  Page_sublist& pl_bind = *m_page_sublist[Page_entry::SL_BIND];
   Page_queue& pl_queue = m_page_queue;
   Ptr<GlobalPage> gptr;
 
diff --git a/storage/ndb/src/kernel/blocks/restore.cpp b/storage/ndb/src/kernel/blocks/restore.cpp
@@ -71,8 +71,6 @@ Restore::execSTTOR(Signal* signal)
 {
   jamEntry();                            
 
-  const Uint32 startphase  = signal->theData[1];
-  const Uint32 typeOfStart = signal->theData[7];
   c_lqh = (Dblqh*)globalData.getBlock(DBLQH);
   c_tup = (Dbtup*)globalData.getBlock(DBTUP);
   sendSTTORRY(signal);
@@ -801,7 +799,6 @@ Restore::parse_table_description(Signal* signal, FilePtr file_ptr,
     return;
   }
   
-  Uint32 null_offset = 0;
   Column c; 
   Uint32 colstore[sizeof(Column)/sizeof(Uint32)];
 
diff --git a/storage/ndb/src/kernel/blocks/tsman.cpp b/storage/ndb/src/kernel/blocks/tsman.cpp
@@ -126,9 +126,6 @@ Tsman::execSTTOR(Signal* signal)
 {
   jamEntry();                            
 
-  const Uint32 startphase  = signal->theData[1];
-  const Uint32 typeOfStart = signal->theData[7];
-
   sendSTTORRY(signal);
   
   return;
@@ -1186,7 +1183,6 @@ Tsman::scan_extent_headers(Signal* signal, Ptr<Datafile> ptr)
   Uint32 firstFree= RNIL;
   Uint32 size = ptr.p->m_extent_size;
   Uint32 per_page = ptr.p->m_online.m_extent_headers_per_extent_page;
-  Uint32 SZ= File_formats::Datafile::EXTENT_HEADER_BITMASK_BITS_PER_PAGE;  
   Uint32 pages= ptr.p->m_online.m_offset_data_pages - 1;
   Uint32 datapages= ptr.p->m_online.m_data_pages;
   Dbtup* tup= (Dbtup*)globalData.getBlock(DBTUP);
diff --git a/storage/ndb/src/kernel/vm/DynArr256.cpp b/storage/ndb/src/kernel/vm/DynArr256.cpp
@@ -303,7 +303,6 @@ DynArr256::expand(Uint32 pos)
   Uint32 idx = 0;
   Uint32 alloc[5];
   Uint32 sz = m_head.m_sz;
-  Uint32 shl = 0;
 
   for (; pos >= g_max_sizes[sz]; sz++);
 
diff --git a/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp b/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
@@ -220,7 +220,6 @@ Ndbd_mem_manager::init(bool alloc_less_memory)
   while (cnt < MAX_CHUNKS && allocated < pages)
   {
     InitChunk chunk; 
-    Uint32 remaining = pages - allocated;
     
 #if defined(_lint) || defined(FORCE_INIT_OF_VARS)
     memset((char*) &chunk, 0 , sizeof(chunk));
diff --git a/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp b/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
@@ -731,10 +731,6 @@ NdbEventOperationImpl::receive_event()
     {
       // Parse the new table definition and
       // create a table object
-      NdbDictionary::Dictionary *myDict = m_ndb->getDictionary();
-#ifdef NOT_USED
-      NdbDictionaryImpl *dict =&NdbDictionaryImpl::getImpl(*myDict);
-#endif
       NdbError error;
       NdbDictInterface dif(error);
       NdbTableImpl *at;
diff --git a/storage/ndb/src/ndbapi/NdbIndexStat.cpp b/storage/ndb/src/ndbapi/NdbIndexStat.cpp
@@ -240,7 +240,6 @@ NdbIndexStat::stat_oldest(const Area& a)
   m = ~(Uint32)0;     // shut up incorrect CC warning
   for (i = 0; i < a.m_entries; i++) {
     Pointer& p = a.get_pointer(i);
-    Entry& e = a.get_entry(i);
     Uint32 m2 = m_seq >= p.m_seq ? m_seq - p.m_seq : p.m_seq - m_seq;
     if (! found || m < m2) {
       m = m2;
diff --git a/storage/ndb/src/ndbapi/NdbRecAttr.cpp b/storage/ndb/src/ndbapi/NdbRecAttr.cpp
@@ -120,8 +120,8 @@ NdbRecAttr::clone() const {
 }
 
 bool
-NdbRecAttr::receive_data(const Uint32 * data, Uint32 sz){
-  const Uint32 n = m_size_in_bytes;
+NdbRecAttr::receive_data(const Uint32 * data, Uint32 sz)
+{
   if(sz)
   {
     if(!copyoutRequired())
diff --git a/storage/ndb/tools/desc.cpp b/storage/ndb/tools/desc.cpp
@@ -98,7 +98,6 @@ int main(int argc, char** argv){
     return NDBT_ProgramExit(NDBT_FAILED);
   }
 
-  NdbDictionary::Dictionary * dict= MyNdb.getDictionary();
   for(int i= 0; i<argc;i++)
   {
     if(desc_table(&MyNdb,argv[i]))
diff --git a/support-files/compiler_warnings.supp b/support-files/compiler_warnings.supp
@@ -14,3 +14,4 @@ kernel_types.h : .*only defines private constructors and has no friends.* : 51
 Dbtup.hpp:   .*only defines private constructors and has no friends.*
 diskpage.hpp:   .*only defines private constructors and has no friends.*
 tuppage.hpp:   .*only defines private constructors and has no friends.*
+NdbScanOperation.cpp: .*unused variable '__align'.* : 1192

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`1 failure (cannot happen)`
`41`	`41`	`*/`
`42`	`42`
`43`		`-static int daemon_example_plugin_init(void *p)`
	`43`	`+static int daemon_example_plugin_init(void *p __attribute__ ((unused)))`
`44`	`44`	`{`
`45`	`45`	`return(0);`
`46`	`46`	`}`
`@@ -59,7 +59,7 @@ static int daemon_example_plugin_init(void *p)`
`59`	`59`
`60`	`60`	`*/`
`61`	`61`
`62`		`-static int daemon_example_plugin_deinit(void *p)`
	`62`	`+static int daemon_example_plugin_deinit(void *p __attribute__ ((unused)))`
`63`	`63`	`{`
`64`	`64`	`return(0);`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -896,7 +896,7 @@ longlong Item_in_optimizer::val_int()`
`896`	`896`	`*/`
`897`	`897`	`for (i= 0; i < ncols; i++)`
`898`	`898`	`{`
`899`		`- if (cache->el(i)->null_value)`
	`899`	`+ if (cache->element_index(i)->null_value)`
`900`	`900`	`item_subs->set_cond_guard_var(i, FALSE);`
`901`	`901`	`}`
`902`	`902`
`@@ -1020,8 +1020,10 @@ longlong Item_func_strcmp::val_int()`
`1020`	`1020`
`1021`	`1021`	`void Item_func_interval::fix_length_and_dec()`
`1022`	`1022`	`{`
`1023`		`- use_decimal_comparison= (row->element_index(0)->result_type() == DECIMAL_RESULT) \|\|`
`1024`		`- (row->element_index(0)->result_type() == INT_RESULT);`
	`1023`	`+ use_decimal_comparison= ((row->element_index(0)->result_type() ==`
	`1024`	`+ DECIMAL_RESULT) \|\|`
	`1025`	`+ (row->element_index(0)->result_type() ==`
	`1026`	`+ INT_RESULT));`
`1025`	`1027`	`if (row->cols() > 8)`
`1026`	`1028`	`{`
`1027`	`1029`	`bool consts=1;`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ usage()`
`40`	`40`	`<< "Example: " << progname << " -ceq ndb_*_fs/D[12]/DBDICT/P0.SchemaLog" << endl;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+#ifdef NOT_USED`
	`44`	`+`
`43`	`45`	`static void`
`44`	`46`	`fill(const char * buf, int mod)`
`45`	`47`	`{`
`@@ -50,6 +52,7 @@ fill(const char * buf, int mod)`
`50`	`52`	`len++;`
`51`	`53`	`}`
`52`	`54`	`}`
	`55`	`+#endif`
`53`	`56`
`54`	`57`	`static const char*`
`55`	`58`	`version(Uint32 v)`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,6 @@ Restore::execSTTOR(Signal* signal)`
`71`	`71`	`{`
`72`	`72`	`jamEntry();`
`73`	`73`
`74`		`- const Uint32 startphase = signal->theData[1];`
`75`		`- const Uint32 typeOfStart = signal->theData[7];`
`76`	`74`	`c_lqh = (Dblqh*)globalData.getBlock(DBLQH);`
`77`	`75`	`c_tup = (Dbtup*)globalData.getBlock(DBTUP);`
`78`	`76`	`sendSTTORRY(signal);`
`@@ -801,7 +799,6 @@ Restore::parse_table_description(Signal* signal, FilePtr file_ptr,`
`801`	`799`	`return;`
`802`	`800`	`}`
`803`	`801`
`804`		`- Uint32 null_offset = 0;`
`805`	`802`	`Column c;`
`806`	`803`	`Uint32 colstore[sizeof(Column)/sizeof(Uint32)];`
`807`	`804`