diff options
| author | unknown <osku@127.(none)> | 2005-09-28 14:26:33 +0300 |
|---|---|---|
| committer | unknown <osku@127.(none)> | 2005-09-28 14:26:33 +0300 |
| commit | a11fc7341cadf393ed3378c9a113ca606dc297ed (patch) | |
| tree | 38a9308c72dc1e24175d3151a2b9e1c5445534fd | |
| parent | a5dd3d5d8f8e67cb74403f8265b9c61daf9d5ccd (diff) | |
| download | mariadb-git-a11fc7341cadf393ed3378c9a113ca606dc297ed.tar.gz | |
InnoDB: Remove compiler warnings.
innobase/os/os0proc.c:
Add UT_NOT_USED for parameters in dummy implementations of AWE functions.
sql/ha_innodb.cc:
Tweak casts to eliminate compiler warnings.
| -rw-r--r-- | innobase/os/os0proc.c | 9 | ||||
| -rw-r--r-- | sql/ha_innodb.cc | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/innobase/os/os0proc.c b/innobase/os/os0proc.c index 167aed93de7..24bb007e504 100644 --- a/innobase/os/os0proc.c +++ b/innobase/os/os0proc.c @@ -292,6 +292,9 @@ os_awe_allocate_physical_mem( return(TRUE); #else + UT_NOT_USED(n_megabytes); + UT_NOT_USED(page_info); + return(FALSE); #endif } @@ -349,6 +352,8 @@ os_awe_allocate_virtual_mem_window( return(ptr); #else + UT_NOT_USED(size); + return(NULL); #endif } @@ -476,6 +481,10 @@ os_awe_map_physical_mem_to_window( return(TRUE); #else + UT_NOT_USED(ptr); + UT_NOT_USED(n_mem_pages); + UT_NOT_USED(page_info); + return(FALSE); #endif } diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 69c20bb7974..afa8570c144 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -2116,7 +2116,7 @@ innobase_rollback_to_savepoint( /* 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 @@ innobase_release_savepoint( /* 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 @@ innobase_savepoint( /* 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); |