merged

BitKeeper/etc/ignore:
  auto-union
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
innobase/buf/buf0lru.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/include/page0page.ic:
  Auto merged
innobase/include/srv0srv.h:
  Auto merged
innobase/os/os0thread.c:
  Auto merged
innobase/rem/rem0cmp.c:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
innobase/row/row0sel.c:
  Auto merged
innobase/srv/srv0srv.c:
  Auto merged
innobase/trx/trx0sys.c:
  Auto merged
innobase/trx/trx0trx.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
myisam/ft_parser.c:
  Auto merged
myisam/mi_create.c:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/ndb_alter_table.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
mysql-test/t/ndb_alter_table.test:
  Auto merged
mysys/hash.c:
  Auto merged
mysys/my_bitmap.c:
  Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

4 files changed, 7 insertions, 7 deletions

diff --git a/innobase/include/mem0mem.ic b/innobase/include/mem0mem.ic
index 714c30e3642..82d88099c3f 100644
--- a/innobase/include/mem0mem.ic
+++ b/innobase/include/mem0mem.ic
@@ -606,7 +606,7 @@ mem_strdupq(
 	char*		dst;
 	char*		d;
 	const char*	s	= str;
-	int		len	= strlen(str) + 3;
+	size_t		len	= strlen(str) + 3;
 	/* calculate the number of quote characters in the string */
 	while((s = strchr(s, q)) != NULL) {
 		s++;
diff --git a/innobase/include/page0page.ic b/innobase/include/page0page.ic
index ac6b0263a7d..bc0805ca30c 100644
--- a/innobase/include/page0page.ic
+++ b/innobase/include/page0page.ic
@@ -549,10 +549,10 @@ page_rec_get_next(
 "InnoDB: Next record offset is nonsensical %lu in record at offset %lu\n",
 		(ulong)offs, (ulong)(rec - page));
 		fprintf(stderr,
-"\nInnoDB: rec address %lx, first buffer frame %lx\n"
-"InnoDB: buffer pool high end %lx, buf fix count %lu\n",
-				(ulong)rec, (ulong)buf_pool->frame_zero,
-				(ulong)buf_pool->high_end,
+"\nInnoDB: rec address %p, first buffer frame %p\n"
+"InnoDB: buffer pool high end %p, buf fix count %lu\n",
+				rec, buf_pool->frame_zero,
+				buf_pool->high_end,
 				(ulong)buf_block_align(rec)->buf_fix_count);
 		buf_page_print(page);
 
diff --git a/innobase/include/pars0pars.h b/innobase/include/pars0pars.h
index 28985e2f9d0..62a41a881e8 100644
--- a/innobase/include/pars0pars.h
+++ b/innobase/include/pars0pars.h
@@ -414,7 +414,7 @@ pars_complete_graph_for_exec(
 
 /* Struct used to denote a reserved word in a parsing tree */
 struct pars_res_word_struct{
-	ulint	code;	/* the token code for the reserved word from
+	int	code;	/* the token code for the reserved word from
 			pars0grm.h */
 };
 
diff --git a/innobase/include/pars0sym.h b/innobase/include/pars0sym.h
index a40523861dd..633a49e3cb5 100644
--- a/innobase/include/pars0sym.h
+++ b/innobase/include/pars0sym.h
@@ -152,7 +152,7 @@ struct sym_tab_struct{
 					parser */
 	const char*		sql_string;
 					/* SQL string to parse */
-	int			string_len;
+	size_t			string_len;
 					/* SQL string length */
 	int			next_char_pos;
 					/* position of the next character in