List:Commits« Previous MessageNext Message »
From:vasil.dimov Date:November 12 2010 8:08am
Subject:bzr push into mysql-next-mr-innodb branch (vasil.dimov:3317 to 3319)
View as plain text  
 3319 Vasil Dimov	2010-11-12
      Fix bogus compiler warning in ha_innodb.cc:4620
      
      /export/home/sunny/innodb/next-mr/storage/innobase/handler/ha_innodb.cc: In member function `uint ha_innobase::store_key_val_for_row(uint, char*, uint, const uchar*)':
      /export/home/sunny/innodb/next-mr/storage/innobase/handler/ha_innodb.cc:4620: warning: 'cs' might be used uninitialized in this function
      
      Reported by:	Sunny

    modified:
      storage/innobase/handler/ha_innodb.cc
 3318 Vasil Dimov	2010-11-12
      Fix bogus compiler warning in ibuf0ibuf.c:4062
      
      /export/home/sunny/innodb/next-mr/storage/innobase/ibuf/ibuf0ibuf.c: In function `ibuf_merge_or_delete_for_page':
      /export/home/sunny/innodb/next-mr/storage/innobase/ibuf/ibuf0ibuf.c:4062: warning: 'max_ins_size' might be used uninitialized in this function
      
      Reported by:	Sunny

    modified:
      storage/innobase/ibuf/ibuf0ibuf.c
 3317 Calvin Sun	2010-11-11
      Fix the atomic function on Windows. Windows does not have InterlockedAdd,
      nor InterlockedDecrement, use InterlockedExchangeAdd instead.
      For substract, just pass in negative amount to InterlockedExchangeAdd.

    modified:
      storage/innobase/include/os0sync.h
=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:calvin.sun@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:vasil.dimov@stripped
@@ -4617,7 +4617,7 @@ ha_innobase::store_key_val_for_row(
 			value we store may be also in a column prefix
 			index. */
 
-			CHARSET_INFO*		cs;
+			CHARSET_INFO*		cs = NULL;
 			ulint			true_len;
 			ulint			key_len;
 			const uchar*		src_start;
@@ -4671,6 +4671,7 @@ ha_innobase::store_key_val_for_row(
 
 			if (true_len < key_len) {
 				ulint	pad_len = key_len - true_len;
+				ut_a(cs != NULL);
 				ut_a(!(pad_len % cs->mbminlen));
 
 				cs->cset->fill(cs, buff, pad_len,

=== modified file 'storage/innobase/ibuf/ibuf0ibuf.c'
--- a/storage/innobase/ibuf/ibuf0ibuf.c	revid:calvin.sun@stripped
+++ b/storage/innobase/ibuf/ibuf0ibuf.c	revid:vasil.dimov@stripped
@@ -4059,7 +4059,7 @@ ibuf_delete(
 		ulint		offsets_[REC_OFFS_NORMAL_SIZE];
 		ulint*		offsets	= offsets_;
 		mem_heap_t*	heap = NULL;
-		ulint		max_ins_size;
+		ulint		max_ins_size = 0;
 
 		rec_offs_init(offsets_);
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-next-mr-innodb branch (vasil.dimov:3317 to 3319) vasil.dimov12 Nov