1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 127.(none):/home/osku/mysql/5.0/clean

Browse Source 
into  127.(none):/home/osku/mysql/5.0/13497
This commit is contained in:
unknown 2005-09-28 14:40:02 +03:00
commit 871a1c223d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
innobase/os/os0proc.c
View File

@ -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
}

6
sql/ha_innodb.cc
View File

@ -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);

2
strings/decimal.c
View File

@ -1033,7 +1033,7 @@ int decimal2ulonglong(decimal_t *from, ulonglong *to)
{
ulonglong y=x;
x=x*DIG_BASE + *buf++;
if (unlikely(y > (ULONGLONG_MAX/DIG_BASE) || x < y))
if (unlikely(y > ((ulonglong) ULONGLONG_MAX/DIG_BASE) || x < y))
{
*to=y;
return E_DEC_OVERFLOW;