Commit f5f0d796 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents b4d738e7 ced7d0ef

innobase/os/os0proc.c

+9 −0
Original line number Diff line number Diff line
@@ -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

}

sql/ha_innodb.cc

+3 −3
Original line number Diff line number Diff line
@@ -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);

strings/decimal.c

+1 −1
Original line number Diff line number Diff line
@@ -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;