bk commit into 5.0 tree (osku:1.2002)

[Osku Salerma]

Below is the list of changes that have just been committed into a local
5.0 repository of osku. When osku 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.2002 05/09/28 14:26:33 osku@127.(none) +2 -0
  InnoDB: Remove compiler warnings.

  sql/ha_innodb.cc
    1.262 05/09/28 14:26:26 osku@127.(none) +3 -3
    Tweak casts to eliminate compiler warnings.

  innobase/os/os0proc.c
    1.15 05/09/28 14:26:26 osku@127.(none) +9 -0
    Add UT_NOT_USED for parameters in dummy implementations of AWE functions. 

# 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:	osku
# Host:	127.(none)
# Root:	/home/osku/mysql/5.0/warn-rem

--- 1.14/innobase/os/os0proc.c	2005-01-13 19:09:25 +02:00
+++ 1.15/innobase/os/os0proc.c	2005-09-28 14:26:26 +03:00
@@ -292,6 +292,9 @@
 
 	return(TRUE);	
 #else
+	UT_NOT_USED(n_megabytes);
+	UT_NOT_USED(page_info);
+	
 	return(FALSE);
 #endif
 }
@@ -349,6 +352,8 @@
 
 	return(ptr);
 #else
+	UT_NOT_USED(size);
+	
 	return(NULL);
 #endif
 }
@@ -476,6 +481,10 @@
 
 	return(TRUE);
 #else
+	UT_NOT_USED(ptr);
+	UT_NOT_USED(n_mem_pages);
+	UT_NOT_USED(page_info);
+
 	return(FALSE);
 #endif
 }	

--- 1.261/sql/ha_innodb.cc	2005-09-23 16:40:54 +03:00
+++ 1.262/sql/ha_innodb.cc	2005-09-28 14:26:26 +03:00
@@ -2116,7 +2116,7 @@
 
         /* TODO: use provided savepoint data area to store savepoint data */
 
-        longlong2str((ulonglong)savepoint, name, 36);
+        longlong2str((ulint)savepoint, name, 36);
 
         error = (int) trx_rollback_to_savepoint_for_mysql(trx, name,
 						&mysql_binlog_cache_pos);
@@ -2145,7 +2145,7 @@
 
         /* TODO: use provided savepoint data area to store savepoint data */
 
-        longlong2str((ulonglong)savepoint, name, 36);
+        longlong2str((ulint)savepoint, name, 36);
 
 	error = (int) trx_release_savepoint_for_mysql(trx, name);
 
@@ -2186,7 +2186,7 @@
 
         /* TODO: use provided savepoint data area to store savepoint data */
         char name[64];
-        longlong2str((ulonglong)savepoint,name,36);
+        longlong2str((ulint)savepoint,name,36);
 
         error = (int) trx_savepoint_for_mysql(trx, name, (ib_longlong)0);