Merge with 4.0

innobase/dict/dict0boot.c:
  Auto merged
innobase/dict/dict0load.c:
  Auto merged
innobase/dict/dict0mem.c:
  Auto merged
innobase/fut/fut0lst.c:
  Auto merged
innobase/include/buf0lru.h:
  Auto merged
innobase/include/dict0mem.h:
  Auto merged
innobase/include/fsp0fsp.h:
  Auto merged
innobase/include/ha0ha.h:
  Auto merged
innobase/include/ibuf0ibuf.h:
  Auto merged
innobase/include/lock0lock.h:
  Auto merged
innobase/include/log0log.h:
  Auto merged
innobase/include/mem0pool.h:
  Auto merged
innobase/include/mtr0mtr.h:
  Auto merged
innobase/include/os0file.h:
  Auto merged
innobase/include/rem0rec.h:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/include/sync0sync.h:
  Auto merged
innobase/include/trx0sys.h:
  Auto merged
innobase/include/ut0byte.h:
  Auto merged
innobase/include/ut0ut.h:
  Auto merged
innobase/mem/mem0pool.c:
  Auto merged
innobase/mtr/mtr0mtr.c:
  Auto merged
innobase/os/os0proc.c:
  Auto merged
innobase/pars/lexyy.c:
  Auto merged
innobase/pars/pars0opt.c:
  Auto merged
innobase/row/row0ins.c:
  Auto merged
innobase/row/row0purge.c:
  Auto merged
innobase/row/row0uins.c:
  Auto merged
innobase/row/row0umod.c:
  Auto merged
innobase/row/row0undo.c:
  Auto merged
innobase/row/row0upd.c:
  Auto merged
innobase/trx/trx0purge.c:
  Auto merged
innobase/trx/trx0roll.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0undo.c:
  Auto merged
innobase/ut/ut0byte.c:
  Auto merged
pstack/bucomm.h:
  Auto merged
pstack/budbg.h:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
tests/insert_test.c:
  Auto merged
mysql-test/t/func_group.test:
  Merge with 4.0
  Put 4.1 tests lasts
sql/ha_innodb.cc:
  Merge with 4.0
  Added checking of results from my_malloc()
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 13 insertions, 76 deletions

diff --git a/innobase/rem/rem0rec.c b/innobase/rem/rem0rec.c
index 3d0b997db85..1db89241dff 100644
--- a/innobase/rem/rem0rec.c
+++ b/innobase/rem/rem0rec.c
@@ -112,7 +112,7 @@ rec_get_nth_field(
 	}
 
 	if (rec == NULL) {
-		fprintf(stderr, "Error: rec is NULL pointer\n");
+		fputs("Error: rec is NULL pointer\n", stderr);
 		ut_error;
 	}
 	
@@ -518,110 +518,47 @@ Prints a physical record. */
 void
 rec_print(
 /*======*/
+	FILE*	file,	/* in: file where to print */
 	rec_t*	rec)	/* in: physical record */
 {
 	byte*	data;
 	ulint	len;
-	char*	offs;
 	ulint	n;
 	ulint	i;
 
 	ut_ad(rec);
 	
-	if (rec_get_1byte_offs_flag(rec)) {
-		offs = (char *) "TRUE";
-	} else {
-		offs = (char *) "FALSE";
-	}
-
 	n = rec_get_n_fields(rec);
 
-	printf(
-	    "PHYSICAL RECORD: n_fields %lu; 1-byte offs %s; info bits %lu\n",
-		(ulong) n, offs, (ulong) rec_get_info_bits(rec));
+	fprintf(file, "PHYSICAL RECORD: n_fields %lu;"
+		" 1-byte offs %s; info bits %lu\n",
+		(ulong) n, rec_get_1byte_offs_flag(rec) ? "TRUE" : "FALSE",
+		(ulong) rec_get_info_bits(rec));
 	
 	for (i = 0; i < n; i++) {
 
 		data = rec_get_nth_field(rec, i, &len);
 
-		printf(" %lu:", (ulong) i);
+		fprintf(file, " %lu:", (ulong) i);
 	
 		if (len != UNIV_SQL_NULL) {
 			if (len <= 30) {
 
-				ut_print_buf(data, len);
+				ut_print_buf(file, data, len);
 			} else {
-				ut_print_buf(data, 30);
+				ut_print_buf(file, data, 30);
 
-				printf("...(truncated)");
+				fputs("...(truncated)", file);
 			}
 		} else {
-			printf(" SQL NULL, size %lu ",
+			fprintf(file, " SQL NULL, size %lu ",
 				      (ulong) rec_get_nth_field_size(rec, i));
 						
 		}
-		printf(";");
+		putc(';', file);
 	}
 
-	printf("\n");
+	putc('\n', file);
 
 	rec_validate(rec);
 }
-
-/*******************************************************************
-Prints a physical record to a buffer. */
-
-ulint
-rec_sprintf(
-/*========*/
-			/* out: printed length in bytes */
-	char*	buf,	/* in: buffer to print to */
-	ulint	buf_len,/* in: buffer length */
-	rec_t*	rec)	/* in: physical record */
-{
-	byte*	data;
-	ulint	len;
-	ulint	k;
-	ulint	n;
-	ulint	i;
-
-	ut_ad(rec);
-	
-	n = rec_get_n_fields(rec);
-	k = 0;
-
-	if (k + 30 > buf_len) {
-
-		return(k);
-	}
-	
-	k += sprintf(buf + k, "RECORD: info bits %lu",
-		     (ulong) rec_get_info_bits(rec));
-	
-	for (i = 0; i < n; i++) {
-
-		if (k + 30 > buf_len) {
-
-			return(k);
-		}
-		
-		data = rec_get_nth_field(rec, i, &len);
-
-		k += sprintf(buf + k, " %lu:", (ulong) i);
-	
-		if (len != UNIV_SQL_NULL) {
-			if (k + 30 + 5 * len > buf_len) {
-
-				return(k);
-			}
-			
-			k += ut_sprintf_buf(buf + k, data, len);
-		} else {
-			k += sprintf(buf + k, " SQL NULL");
-		}
-		
-		k += sprintf(buf + k, ";");
-	}
-
-	return(k);
-}