MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:monty Date:January 29 2007 1:18pm
Subject:bk commit into 5.1 tree (monty:1.2413)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-01-29 15:18:20+02:00, monty@stripped +18 -0
  after merge fixes
  Removed 

  mysql-test/t/disabled.def@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +1 -1
    Disabled rp_ndb_dd_advance, becasue of random failures

  mysql-test/t/rpl_ndb_dd_advance.test@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +1 -0
    Added big_test, as this test takes +600 seconds

  plugin/daemon_example/daemon_example.c@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +2 -2
    Removed compiler warnings

  sql/item_cmpfunc.cc@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +5 -3
    after merge fixes

  sql/item_subselect.cc@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +3 -4
    after merge fixes

  storage/ndb/src/common/util/ConfigValues.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -2
    Removed declarations to nonexisting functions

  storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +3 -0
    Removed not used function

  storage/ndb/src/kernel/blocks/lgman.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +1 -7
    Removed not used variables

  storage/ndb/src/kernel/blocks/pgman.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -2
    Removed not used variables

  storage/ndb/src/kernel/blocks/restore.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -3
    Removed not used variables

  storage/ndb/src/kernel/blocks/tsman.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -4
    Removed not used variables

  storage/ndb/src/kernel/vm/DynArr256.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -1
    Removed not used variables

  storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -1
    Removed not used variables

  storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -4
    Removed not used variables

  storage/ndb/src/ndbapi/NdbIndexStat.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -1
    Removed not used variable

  storage/ndb/src/ndbapi/NdbRecAttr.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +2 -2
    Removed not used variable

  storage/ndb/tools/desc.cpp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +0 -1
    Removed not used variable

  support-files/compiler_warnings.supp@stripped, 2007-01-29 15:18:18+02:00, monty@stripped +1 -0
    Added suppress message for hard to remove warning

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	monty
# Host:	narttu.mysql.fi
# Root:	/home/my/mysql-5.1

--- 1.237/sql/item_cmpfunc.cc	2007-01-29 01:57:04 +02:00
+++ 1.238/sql/item_cmpfunc.cc	2007-01-29 15:18:18 +02:00
@@ -896,7 +896,7 @@
           */
           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 @@
 
 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;

--- 1.143/sql/item_subselect.cc	2007-01-29 01:57:04 +02:00
+++ 1.144/sql/item_subselect.cc	2007-01-29 15:18:18 +02:00
@@ -1259,7 +1259,7 @@
                                       (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 @@
                                                 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 @@
           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 @@
   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())

--- 1.2/plugin/daemon_example/daemon_example.c	2006-12-31 03:20:56 +02:00
+++ 1.3/plugin/daemon_example/daemon_example.c	2007-01-29 15:18:18 +02:00
@@ -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_deinit(void *p)
+static int daemon_example_plugin_deinit(void *p __attribute__ ((unused)))
 {
   return(0);
 }

--- 1.3/support-files/compiler_warnings.supp	2007-01-29 01:47:32 +02:00
+++ 1.4/support-files/compiler_warnings.supp	2007-01-29 15:18:18 +02:00
@@ -14,3 +14,4 @@
 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: .*warning: unused variable '__align'.* : 1192

--- 1.9/mysql-test/t/rpl_ndb_dd_advance.test	2006-11-21 22:42:11 +02:00
+++ 1.10/mysql-test/t/rpl_ndb_dd_advance.test	2007-01-29 15:18:18 +02:00
@@ -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
 

--- 1.23/storage/ndb/src/kernel/blocks/lgman.cpp	2006-12-31 02:04:56 +02:00
+++ 1.24/storage/ndb/src/kernel/blocks/lgman.cpp	2007-01-29 15:18:18 +02:00
@@ -133,10 +133,6 @@
 Lgman::execSTTOR(Signal* signal) 
 {
   jamEntry();                            
-
-  const Uint32 startphase  = signal->theData[1];
-  const Uint32 typeOfStart = signal->theData[7];
-
   sendSTTORRY(signal);
   
   return;
@@ -274,7 +270,6 @@
 		!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 @@
 Lgman::execSUB_GCP_COMPLETE_REP(Signal* signal)
 {
   jamEntry();
-  Uint32 gci= ((SubGcpCompleteRep*)signal->getDataPtr())->gci;
-  
+
   Ptr<Logfile_group> ptr;
   m_logfile_group_list.first(ptr);
 

--- 1.20/storage/ndb/src/kernel/blocks/pgman.cpp	2007-01-15 22:05:11 +02:00
+++ 1.21/storage/ndb/src/kernel/blocks/pgman.cpp	2007-01-29 15:18:18 +02:00
@@ -471,7 +471,6 @@
   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 @@
 #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;
 

--- 1.12/storage/ndb/src/kernel/blocks/restore.cpp	2006-12-23 21:33:30 +02:00
+++ 1.13/storage/ndb/src/kernel/blocks/restore.cpp	2007-01-29 15:18:18 +02:00
@@ -71,8 +71,6 @@
 {
   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 @@
     return;
   }
   
-  Uint32 null_offset = 0;
   Column c; 
   Uint32 colstore[sizeof(Column)/sizeof(Uint32)];
 

--- 1.13/storage/ndb/src/kernel/blocks/tsman.cpp	2006-12-31 02:04:56 +02:00
+++ 1.14/storage/ndb/src/kernel/blocks/tsman.cpp	2007-01-29 15:18:18 +02:00
@@ -126,9 +126,6 @@
 {
   jamEntry();                            
 
-  const Uint32 startphase  = signal->theData[1];
-  const Uint32 typeOfStart = signal->theData[7];
-
   sendSTTORRY(signal);
   
   return;
@@ -1186,7 +1183,6 @@
   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);

--- 1.2/storage/ndb/src/kernel/vm/DynArr256.cpp	2006-12-23 21:33:30 +02:00
+++ 1.3/storage/ndb/src/kernel/vm/DynArr256.cpp	2007-01-29 15:18:18 +02:00
@@ -303,7 +303,6 @@
   Uint32 idx = 0;
   Uint32 alloc[5];
   Uint32 sz = m_head.m_sz;
-  Uint32 shl = 0;
 
   for (; pos >= g_max_sizes[sz]; sz++);
 

--- 1.11/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2006-12-23 21:33:30 +02:00
+++ 1.12/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2007-01-29 15:18:18 +02:00
@@ -220,7 +220,6 @@
   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));

--- 1.14/storage/ndb/src/common/util/ConfigValues.cpp	2007-01-27 03:46:41 +02:00
+++ 1.15/storage/ndb/src/common/util/ConfigValues.cpp	2007-01-29 15:18:18 +02:00
@@ -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);
 
 /**

--- 1.229/mysql-test/t/disabled.def	2007-01-24 21:15:11 +02:00
+++ 1.230/mysql-test/t/disabled.def	2007-01-29 15:18:18 +02:00
@@ -39,4 +39,4 @@
 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

--- 1.14/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	2006-12-23 21:20:15 +02:00
+++ 1.15/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	2007-01-29 15:18:18 +02:00
@@ -40,6 +40,8 @@
     << "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 @@
     len++;
   }
 }
+#endif
 
 static const char*
 version(Uint32 v)

--- 1.78/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-01-29 01:51:40 +02:00
+++ 1.79/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2007-01-29 15:18:18 +02:00
@@ -731,10 +731,6 @@
     {
       // 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;

--- 1.31/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2006-12-23 21:20:23 +02:00
+++ 1.32/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2007-01-29 15:18:18 +02:00
@@ -120,8 +120,8 @@
 }
 
 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())

--- 1.29/storage/ndb/tools/desc.cpp	2007-01-24 19:57:04 +02:00
+++ 1.30/storage/ndb/tools/desc.cpp	2007-01-29 15:18:18 +02:00
@@ -98,7 +98,6 @@
     return NDBT_ProgramExit(NDBT_FAILED);
   }
 
-  NdbDictionary::Dictionary * dict= MyNdb.getDictionary();
   for(int i= 0; i<argc;i++)
   {
     if(desc_table(&MyNdb,argv[i]))

--- 1.6/storage/ndb/src/ndbapi/NdbIndexStat.cpp	2006-12-23 21:33:31 +02:00
+++ 1.7/storage/ndb/src/ndbapi/NdbIndexStat.cpp	2007-01-29 15:18:18 +02:00
@@ -240,7 +240,6 @@
   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;
Thread
bk commit into 5.1 tree (monty:1.2413)monty29 Jan