Commit a11fc734 authored by unknown's avatar unknown

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.
parent a5dd3d5d
...@@ -292,6 +292,9 @@ os_awe_allocate_physical_mem( ...@@ -292,6 +292,9 @@ os_awe_allocate_physical_mem(
return(TRUE); return(TRUE);
#else #else
UT_NOT_USED(n_megabytes);
UT_NOT_USED(page_info);
return(FALSE); return(FALSE);
#endif #endif
} }
...@@ -349,6 +352,8 @@ os_awe_allocate_virtual_mem_window( ...@@ -349,6 +352,8 @@ os_awe_allocate_virtual_mem_window(
return(ptr); return(ptr);
#else #else
UT_NOT_USED(size);
return(NULL); return(NULL);
#endif #endif
} }
...@@ -476,6 +481,10 @@ os_awe_map_physical_mem_to_window( ...@@ -476,6 +481,10 @@ os_awe_map_physical_mem_to_window(
return(TRUE); return(TRUE);
#else #else
UT_NOT_USED(ptr);
UT_NOT_USED(n_mem_pages);
UT_NOT_USED(page_info);
return(FALSE); return(FALSE);
#endif #endif
} }
......
...@@ -2116,7 +2116,7 @@ innobase_rollback_to_savepoint( ...@@ -2116,7 +2116,7 @@ innobase_rollback_to_savepoint(
/* TODO: use provided savepoint data area to store savepoint data */ /* 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, error = (int) trx_rollback_to_savepoint_for_mysql(trx, name,
&mysql_binlog_cache_pos); &mysql_binlog_cache_pos);
...@@ -2145,7 +2145,7 @@ innobase_release_savepoint( ...@@ -2145,7 +2145,7 @@ innobase_release_savepoint(
/* TODO: use provided savepoint data area to store savepoint data */ /* 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); error = (int) trx_release_savepoint_for_mysql(trx, name);
...@@ -2186,7 +2186,7 @@ innobase_savepoint( ...@@ -2186,7 +2186,7 @@ innobase_savepoint(
/* TODO: use provided savepoint data area to store savepoint data */ /* TODO: use provided savepoint data area to store savepoint data */
char name[64]; char name[64];
longlong2str((ulonglong)savepoint,name,36); longlong2str((ulint)savepoint,name,36);
error = (int) trx_savepoint_for_mysql(trx, name, (ib_longlong)0); error = (int) trx_savepoint_for_mysql(trx, name, (ib_longlong)0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment