bzr push into mysql-trunk branch (vasil.dimov:3115 to 3116)

[vasil.dimov]

 3116 Vasil Dimov	2011-05-25
      Non-functional: remove excess ";"

    modified:
      storage/innobase/handler/i_s.cc
      storage/innobase/que/que0que.c
 3115 Marko Mäkelä	2011-05-26
      InnoDB: Fix a compiler warning.
      
      open_or_create_data_files(): Truncate the number of pages to ulint.
      The InnoDB page number is 32 bits. This limits the tablespace file size
      to 1<<(32+UNIV_PAGE_SIZE_SHIFT) bytes, or 64 terabytes.

    modified:
      storage/innobase/srv/srv0start.c
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc	revid:marko.makela@stripped10526062948-hd04ybuz4qr6ijby
+++ b/storage/innobase/handler/i_s.cc	revid:vasil.dimov@strippedzc3xo1yzczyi4
@@ -3347,7 +3347,7 @@ i_s_innodb_buffer_page_get_info(
 
 		page_info->space_id = buf_page_get_space(bpage);
 
-		page_info->page_num = buf_page_get_page_no(bpage);;
+		page_info->page_num = buf_page_get_page_no(bpage);
 
 		page_info->flush_type = bpage->flush_type;
 
@@ -4793,7 +4793,7 @@ i_s_sys_indexes_fill_table(
 
 	/* Process each record in the table */
 	while (rec) {
-		const char*	err_msg;;
+		const char*	err_msg;
 		table_id_t	table_id;
 		dict_index_t	index_rec;
 

=== modified file 'storage/innobase/que/que0que.c'
--- a/storage/innobase/que/que0que.c	revid:marko.makela@stripped8-hd04ybuz4qr6ijby
+++ b/storage/innobase/que/que0que.c	revid:vasil.dimov@strippedi4
@@ -703,7 +703,7 @@ que_thr_stop(
 	que_thr_t*	thr)	/*!< in: query thread */
 {
 	que_t*		graph;
-	trx_t*		trx = thr_get_trx(thr);;
+	trx_t*		trx = thr_get_trx(thr);
 
 	graph = thr->graph;
 

No bundle (reason: useless for push emails).