bk commit into 5.0 tree (marko:1.1985)

[Marko Mäkelä]

Below is the list of changes that have just been committed into a local
5.0 repository of marko. When marko 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.1985 05/06/22 12:51:00 marko@stripped +1 -0
  InnoDB: Remove compilation warnings and errors on SGI IRIX.

  innobase/row/row0ins.c
    1.68 05/06/22 12:50:51 marko@stripped +4 -8
    Remove compilation warnings and errors on SGI IRIX.

# 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:	marko
# Host:	hundin.mysql.fi
# Root:	/home/marko/mysql-5.0-current

--- 1.67/innobase/row/row0ins.c	Tue Jun 21 07:36:02 2005
+++ 1.68/innobase/row/row0ins.c	Wed Jun 22 12:50:51 2005
@@ -533,9 +533,11 @@
 				        ufield->new_val.data =
 						mem_heap_alloc(heap,
 								min_size);
-					pad_start = ufield->new_val.data
+					pad_start =
+						((char*) ufield->new_val.data)
 						+ ufield->new_val.len;
-					pad_end = ufield->new_val.data
+					pad_end =
+						((char*) ufield->new_val.data)
 						+ min_size;
 					ufield->new_val.len = min_size;
 					ut_memcpy(ufield->new_val.data,
@@ -1578,7 +1580,6 @@
 	ulint		err		= DB_SUCCESS;
 	ibool		moved;
 	mtr_t		mtr;
-	trx_t*		trx;
 	mem_heap_t*	heap		= NULL;
 	ulint		offsets_[REC_OFFS_NORMAL_SIZE];
 	ulint*		offsets		= offsets_;
@@ -1618,11 +1619,6 @@
 			goto next_rec;
 		}
 				
-		/* Try to place a lock on the index record */
-
-		trx = thr_get_trx(thr);      
-		ut_ad(trx);
-
 		offsets = rec_get_offsets(rec, index, offsets,
 					ULINT_UNDEFINED, &heap);