Commit ced7d0ef authored by unknown's avatar unknown
Browse files

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

into  127.(none):/home/osku/mysql/5.0/clean
parents e57abdc7 a11fc734

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