Added xml patch to mysqldump.

Made innodb to compile more cleanly with debugging options
enabled. Fixed a few bugs and found a few possible bugs, which
I hope Heikki will check. Comments needs to be fixed too. Some
while() functions should be changed to do ... until for documenting
purposes, because some of them must and will be processed at least
once, or a variable would be used uninitialized.

Regards,
Jani

3 files changed, 14 insertions, 13 deletions

diff --git a/innobase/btr/btr0btr.c b/innobase/btr/btr0btr.c
index 33a3ac70c90..9cfd1806c5f 100644
--- a/innobase/btr/btr0btr.c
+++ b/innobase/btr/btr0btr.c
@@ -837,7 +837,7 @@ btr_parse_page_reorganize(
 /*======================*/
 			/* out: end of log record or NULL */
 	byte*	ptr,	/* in: buffer */
-	byte*	end_ptr,/* in: buffer end */
+	byte*	end_ptr __attribute__((unused)), /* in: buffer end */
 	page_t*	page,	/* in: page or NULL */
 	mtr_t*	mtr)	/* in: mtr or NULL */
 {
@@ -1438,7 +1438,7 @@ btr_page_split_and_insert(
 	page_t*		insert_page;
 	page_cur_t*	page_cursor;
 	rec_t*		first_rec;
-	byte*		buf;
+	byte*		buf = 0; /* remove warning */
 	rec_t*		move_limit;
 	ibool		insert_will_fit;
 	ulint		n_iterations = 0;
@@ -1616,7 +1616,7 @@ static
 void
 btr_level_list_remove(
 /*==================*/
-	dict_tree_t*	tree,	/* in: index tree */
+	dict_tree_t*	tree __attribute__((unused)), /* in: index tree */
 	page_t*		page,	/* in: page to remove */
 	mtr_t*		mtr)	/* in: mtr */
 {	
@@ -2338,7 +2338,7 @@ btr_validate_level(
 {
 	ulint		space;
 	page_t*		page;
-	page_t*		right_page;
+	page_t*		right_page = 0; /* remove warning */
 	page_t*		father_page;
 	page_t*		right_father_page;
 	rec_t*		node_ptr;
diff --git a/innobase/btr/btr0cur.c b/innobase/btr/btr0cur.c
index a64ed8b6fe1..c553bcacf7f 100644
--- a/innobase/btr/btr0cur.c
+++ b/innobase/btr/btr0cur.c
@@ -94,7 +94,7 @@ static
 void
 btr_cur_latch_leaves(
 /*=================*/
-	dict_tree_t*	tree,		/* in: index tree */
+	dict_tree_t*	tree __attribute__((unused)),	/* in: index tree */
 	page_t*		page,		/* in: leaf page where the search
 					converged */
 	ulint		space,		/* in: space id */
@@ -219,7 +219,7 @@ btr_cur_search_to_nth_level(
 	ulint		insert_planned;
 	ulint		buf_mode;
 	ulint		estimate;
-	ulint		root_height;
+	ulint		root_height = 0; /* remove warning */
 #ifdef BTR_CUR_ADAPT
 	btr_search_t*	info;
 #endif
@@ -488,7 +488,7 @@ btr_cur_open_at_index_side(
 	ulint		page_no;
 	ulint		space;
 	ulint		height;
-	ulint		root_height;
+	ulint		root_height = 0; /* remove warning */
 	rec_t*		node_ptr;
 	ulint		estimate;
 
@@ -2907,8 +2907,9 @@ btr_store_big_rec_extern_fields(
 	rec_t*		rec,		/* in: record */
 	big_rec_t*	big_rec_vec,	/* in: vector containing fields
 					to be stored externally */
-	mtr_t*		local_mtr)	/* in: mtr containing the latch to
-					rec and to the tree */
+	mtr_t*		local_mtr __attribute__((unused))) /* in: mtr
+                                        containing the latch to rec and to the
+                                        tree */
 {
 	byte*	data;
 	ulint	local_len;
@@ -3069,9 +3070,9 @@ btr_free_externally_stored_field(
 	ibool		do_not_free_inherited,/* in: TRUE if called in a
 					rollback and we do not want to free
 					inherited fields */
-	mtr_t*		local_mtr)	/* in: mtr containing the latch to
-					data an an X-latch to the index
-					tree */
+	mtr_t*		local_mtr __attribute__((unused))) /* in: mtr 
+                                        containing the latch to data an an 
+                                        X-latch to the index tree */
 {
 	page_t*	page;
 	page_t*	rec_page;
diff --git a/innobase/btr/btr0sea.c b/innobase/btr/btr0sea.c
index 31ef8ce573b..2e08941894c 100644
--- a/innobase/btr/btr0sea.c
+++ b/innobase/btr/btr0sea.c
@@ -1245,7 +1245,7 @@ btr_search_update_hash_on_insert(
 	dulint		tree_id;
 	ulint		fold;
 	ulint		ins_fold;
-	ulint		next_fold;
+	ulint		next_fold = 0; /* remove warning (??? bug ???) */
 	ulint		n_fields;
 	ulint		n_bytes;
 	ulint		side;