bk commit into 5.1 tree (monty:1.2244)

[monty]

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
  1.2244 06/03/29 17:04:00 monty@stripped +18 -0
  Remove compiler warnings
  Add missing DBUG_RETURN
  Fixed stack overflow in NdbBlob (found by ndb_gis.test)
  Fixed access to freed memory in ndb_cluster_real_free_share()

  storage/ndb/src/ndbapi/NdbScanOperation.cpp
    1.80 06/03/29 17:03:57 monty@stripped +1 -1
    Remove compiler warning

  storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
    1.19 06/03/29 17:03:56 monty@stripped +1 -0
    Remove compiler warning

  storage/ndb/src/ndbapi/NdbBlob.cpp
    1.41 06/03/29 17:03:56 monty@stripped +1 -1
    Fix stack overflow

  storage/ndb/src/ndbapi/ClusterMgr.hpp
    1.9 06/03/29 17:03:56 monty@stripped +2 -0
    Remove compiler warning

  storage/ndb/include/util/SocketServer.hpp
    1.10 06/03/29 17:03:56 monty@stripped +1 -0
    Remove compiler warning

  storage/ndb/include/util/SimpleProperties.hpp
    1.9 06/03/29 17:03:56 monty@stripped +1 -0
    Remove compiler warning

  storage/ndb/include/transporter/TransporterDefinitions.hpp
    1.17 06/03/29 17:03:56 monty@stripped +1 -0
    Remove compiler warning

  storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
    1.27 06/03/29 17:03:56 monty@stripped +5 -0
    Remove compiler warning

  storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
    1.5 06/03/29 17:03:56 monty@stripped +3 -0
    Remove compiler warning

  storage/myisam/mi_keycache.c
    1.11 06/03/29 17:03:56 monty@stripped +1 -0
    Add missing DBUG_RETURN

  storage/myisam/mi_key.c
    1.48 06/03/29 17:03:56 monty@stripped +1 -1
    Add missing DBUG_RETURN

  storage/csv/ha_tina.cc
    1.37 06/03/29 17:03:56 monty@stripped +3 -2
    Add missing DBUG_RETURN

  sql/sql_base.cc
    1.313 06/03/29 17:03:56 monty@stripped +1 -1
    Add missing DBUG_RETURN

  sql/sp_head.cc
    1.215 06/03/29 17:03:56 monty@stripped +4 -3
    Add missing DBUG_RETURN

  sql/item_strfunc.cc
    1.267 06/03/29 17:03:56 monty@stripped +1 -1
    Add missing DBUG_RETURN

  sql/item_func.cc
    1.282 06/03/29 17:03:56 monty@stripped +3 -4
    Add missing DBUG_RETURN

  sql/ha_ndbcluster.cc
    1.294 06/03/29 17:03:56 monty@stripped +1 -1
    Move free_root to after share handling, as otherwise we will free things needed by
free_table_share()

  mysys/mf_keycache.c
    1.56 06/03/29 17:03:56 monty@stripped +1 -1
    Add missing DBUG_RETURN

# 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.47/storage/myisam/mi_key.c	2006-03-10 18:52:21 +02:00
+++ 1.48/storage/myisam/mi_key.c	2006-03-29 17:03:56 +03:00
@@ -64,7 +64,7 @@
       TODO: nulls processing
     */
 #ifdef HAVE_SPATIAL
-    return sp_make_key(info,keynr,key,record,filepos);
+    DBUG_RETURN(sp_make_key(info,keynr,key,record,filepos));
 #else
     DBUG_ASSERT(0); /* mi_open should check that this never happens*/
 #endif

--- 1.55/mysys/mf_keycache.c	2005-10-12 00:58:17 +03:00
+++ 1.56/mysys/mf_keycache.c	2006-03-29 17:03:56 +03:00
@@ -550,7 +550,7 @@
   }
 #endif
   keycache_pthread_mutex_unlock(&keycache->cache_lock);
-  return blocks;
+  DBUG_RETURN(blocks);
 }
 
 

--- 1.281/sql/item_func.cc	2006-03-24 13:33:04 +02:00
+++ 1.282/sql/item_func.cc	2006-03-29 17:03:56 +03:00
@@ -4463,7 +4463,7 @@
     DBUG_RETURN(-1.0);
 
   if (table->null_row) /* NULL row from an outer join */
-    return 0.0;
+    DBUG_RETURN(0.0);
 
   if (join_key)
   {
@@ -4480,9 +4480,8 @@
     DBUG_RETURN(ft_handler->please->find_relevance(ft_handler,
 				      (byte *)a->ptr(), a->length()));
   }
-  else
-    DBUG_RETURN(ft_handler->please->find_relevance(ft_handler,
-                                                   table->record[0], 0));
+  DBUG_RETURN(ft_handler->please->find_relevance(ft_handler,
+                                                 table->record[0], 0));
 }
 
 void Item_func_match::print(String *str)

--- 1.266/sql/item_strfunc.cc	2006-03-13 16:34:16 +02:00
+++ 1.267/sql/item_strfunc.cc	2006-03-29 17:03:56 +03:00
@@ -2593,7 +2593,7 @@
   tmp_value.length(stat_info.st_size);
   my_close(file, MYF(0));
   null_value = 0;
-  return &tmp_value;
+  DBUG_RETURN(&tmp_value);
 
 err:
   null_value = 1;

--- 1.312/sql/sql_base.cc	2006-03-29 14:27:31 +03:00
+++ 1.313/sql/sql_base.cc	2006-03-29 17:03:56 +03:00
@@ -1738,7 +1738,7 @@
 
   /* an open table operation needs a lot of the stack space */
   if (check_stack_overrun(thd, STACK_MIN_SIZE_FOR_OPEN, (char *)&alias))
-    return 0;
+    DBUG_RETURN(0);
 
   if (thd->killed)
     DBUG_RETURN(0);

--- 1.36/storage/csv/ha_tina.cc	2006-03-06 20:03:09 +02:00
+++ 1.37/storage/csv/ha_tina.cc	2006-03-29 17:03:56 +03:00
@@ -981,12 +981,13 @@
 
 int ha_tina::delete_all_rows()
 {
+  int rc;
   DBUG_ENTER("ha_tina::delete_all_rows");
 
   if (!records_is_known)
-    return (my_errno=HA_ERR_WRONG_COMMAND);
+    DBUG_RETURN(my_errno=HA_ERR_WRONG_COMMAND);
 
-  int rc= my_chsize(share->data_file, 0, 0, MYF(MY_WME));
+  rc= my_chsize(share->data_file, 0, 0, MYF(MY_WME));
 
   if (get_mmap(share, 0) > 0)
     DBUG_RETURN(-1);

--- 1.10/storage/myisam/mi_keycache.c	2005-04-08 01:54:34 +03:00
+++ 1.11/storage/myisam/mi_keycache.c	2006-03-29 17:03:56 +03:00
@@ -159,4 +159,5 @@
   */
   multi_key_cache_change(old_key_cache, new_key_cache);
   pthread_mutex_unlock(&THR_LOCK_myisam);
+  DBUG_VOID_RETURN;
 }

--- 1.4/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp	2005-04-08 03:43:49
+03:00
+++ 1.5/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp	2006-03-29 17:03:56
+03:00
@@ -35,6 +35,8 @@
   STATIC_CONST( DataLength = 2 );
   STATIC_CONST( TextLength = DataLength * 8 );  // hex digits
 
+  ArbitTicket() {}
+
   inline void clear() {
     data[0] = 0;
     data[1] = 0;
@@ -145,6 +147,7 @@
 
   STATIC_CONST( SignalLength = 3 + ArbitTicket::DataLength + NodeBitmask::Size );
 
+   ArbitSignalData() {}
   inline bool match(ArbitSignalData& aData) const {
     return
       node == aData.node &&

--- 1.26/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp	2006-03-05 23:36:15 +02:00
+++ 1.27/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp	2006-03-29 17:03:56 +03:00
@@ -336,6 +336,7 @@
     Uint32 RowGCIFlag;
     Uint32 RowChecksumFlag;
     
+    Table() {}
     void init();
   };
 
@@ -398,6 +399,7 @@
     Uint32 AttributeStorageType;
     char   AttributeDefaultValue[MAX_ATTR_DEFAULT_VALUE_SIZE];
     
+    Attribute() {}
     void init();
 
     inline
@@ -685,6 +687,7 @@
     //GrowSpec LF_RedoGrow;
     Uint32 LF_UndoFreeWordsHi;
     Uint32 LF_UndoFreeWordsLo;
+    Filegroup() {}
     void init();
   };
   static const Uint32 MappingSize;
@@ -700,6 +703,8 @@
     Uint32 FileSizeHi;
     Uint32 FileSizeLo;
     Uint32 FileFreeExtents;
+
+    File() {}
     void init();
   };
   static const Uint32 FileMappingSize;

--- 1.16/storage/ndb/include/transporter/TransporterDefinitions.hpp	2005-07-12 20:23:31
+03:00
+++ 1.17/storage/ndb/include/transporter/TransporterDefinitions.hpp	2006-03-29 17:03:56
+03:00
@@ -117,6 +117,7 @@
   Uint32 i;
   struct SectionSegment * p;
 
+  SegmentedSectionPtr() {}
   void setNull() { p = 0;}
   bool isNull() const { return p == 0;}
 };

--- 1.8/storage/ndb/include/util/SimpleProperties.hpp	2006-03-24 11:19:07 +02:00
+++ 1.9/storage/ndb/include/util/SimpleProperties.hpp	2006-03-29 17:03:56 +03:00
@@ -166,6 +166,7 @@
    */
   class Writer {
   public:
+    Writer() {}
     virtual ~Writer() {}
 
     bool first();

--- 1.9/storage/ndb/include/util/SocketServer.hpp	2005-07-19 21:40:16 +03:00
+++ 1.10/storage/ndb/include/util/SocketServer.hpp	2006-03-29 17:03:56 +03:00
@@ -60,6 +60,7 @@
    */
   class Service {
   public:
+    Service() {}
     virtual ~Service(){}
     
     /**

--- 1.8/storage/ndb/src/ndbapi/ClusterMgr.hpp	2005-09-15 11:42:04 +03:00
+++ 1.9/storage/ndb/src/ndbapi/ClusterMgr.hpp	2006-03-29 17:03:56 +03:00
@@ -179,6 +179,8 @@
     ArbitSignalData data;
     NDB_TICKS timestamp;
 
+    ArbitSignal() {}
+
     inline void init(GlobalSignalNumber aGsn, const Uint32* aData) {
       gsn = aGsn;
       if (aData != NULL)

--- 1.18/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2006-03-11 07:58:42 +02:00
+++ 1.19/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2006-03-29 17:03:56 +03:00
@@ -51,6 +51,7 @@
   EventBufData *m_next_hash; // Next in per-GCI hash
   Uint32 m_pkhash; // PK hash (without op) for fast compare
 
+  EventBufData() {}
   // Get blob part number from blob data
   Uint32 get_blob_part_no() {
     assert(ptr[0].sz > 2);

--- 1.79/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-03-23 22:25:51 +02:00
+++ 1.80/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2006-03-29 17:03:57 +03:00
@@ -169,7 +169,7 @@
   { char* p = getenv("NDB_USE_TUPSCAN");
     if (p != 0) {
       unsigned n = atoi(p); // 0-10
-      if (::time(0) % 10 < n) tupScan = true;
+      if ((unsigned int) (::time(0) % 10) < n) tupScan = true;
     }
   }
 #endif

--- 1.293/sql/ha_ndbcluster.cc	2006-03-29 14:27:30 +03:00
+++ 1.294/sql/ha_ndbcluster.cc	2006-03-29 17:03:56 +03:00
@@ -7060,7 +7060,6 @@
   hash_delete(&ndbcluster_open_tables, (byte*) *share);
   thr_lock_delete(&(*share)->lock);
   pthread_mutex_destroy(&(*share)->mutex);
-  free_root(&(*share)->mem_root, MYF(0));
 
 #ifdef HAVE_NDB_BINLOG
   if ((*share)->table)
@@ -7081,6 +7080,7 @@
 #endif
   }
 #endif
+  free_root(&(*share)->mem_root, MYF(0));
   my_free((gptr) *share, MYF(0));
   *share= 0;
 

--- 1.40/storage/ndb/src/ndbapi/NdbBlob.cpp	2006-03-23 05:19:18 +02:00
+++ 1.41/storage/ndb/src/ndbapi/NdbBlob.cpp	2006-03-29 17:03:56 +03:00
@@ -195,7 +195,7 @@
   assert(c->m_blobTable != NULL);
   const NdbTableImpl& bt = *c->m_blobTable;
   // blob event name
-  char bename[NdbBlobImpl::BlobTableNameSize];
+  char bename[MAX_TAB_NAME_SIZE];
   getBlobEventName(bename, e, c);
   be.setName(bename);
   be.setTable(bt);

--- 1.214/sql/sp_head.cc	2006-03-29 14:27:31 +03:00
+++ 1.215/sql/sp_head.cc	2006-03-29 17:03:56 +03:00
@@ -563,6 +563,7 @@
   TYPELIB *result= NULL;
   CHARSET_INFO *cs= field_def->charset;
   DBUG_ENTER("create_typelib");
+
   if (src->elements)
   {
     result= (TYPELIB*) alloc_root(mem_root, sizeof(TYPELIB));
@@ -570,8 +571,8 @@
     result->name= "";
     if (!(result->type_names=(const char **)
           alloc_root(mem_root,(sizeof(char *)+sizeof(int))*(result->count+1))))
-      return 0;
-    result->type_lengths= (unsigned int *)(result->type_names +
result->count+1);
+      DBUG_RETURN(0);
+    result->type_lengths= (uint*)(result->type_names + result->count+1);
     List_iterator<String> it(*src);
     String conv;
     for (uint i=0; i < result->count; i++)
@@ -604,7 +605,7 @@
     result->type_names[result->count]= 0;
     result->type_lengths[result->count]= 0;
   }
-  return result;
+  DBUG_RETURN(result);
 }