8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 06:43:03 +01:00
This commit is contained in:
asfernandes 2010-02-06 01:32:53 +00:00
parent c6d5bdf53e
commit 281d382185
3 changed files with 9 additions and 3 deletions

View File

@ -332,7 +332,7 @@
*/
/* Update for Solaris 10. The problem still exists pre Solaris 10,
however if you are using A version of Solaris 10 after 11/06 the
however if you are using a version of Solaris 10 after 11/06 the
problem with file descriptors has been solved and this define and
the following function can now be commented out.
If you are using Solaris 10 from 03/05 - 11/06 you need to patch

View File

@ -97,10 +97,12 @@ struct Rdb : public Firebird::GlobalStorage, public TypedHandle<rem_type_rdb>
struct Rvnt* rdb_events; // known events
struct Rsr* rdb_sql_requests; // SQL requests
PACKET rdb_packet; // Communication structure
private:
ISC_STATUS* rdb_status_vector; // Normally used status vector
ISC_STATUS* rdb_status_vector; // Normally used status vector
ISC_STATUS* rdb_async_status_vector; // status vector for async thread
FB_THREAD_ID rdb_async_thread_id; // Id of async thread (when active)
public:
Firebird::Mutex rdb_async_lock; // Sync to avoid 2 async calls at once
@ -121,19 +123,22 @@ public:
static ISC_STATUS badHandle() { return isc_bad_db_handle; }
// This 2 functions assume rdb_async_lock to be locked
// This 2 functions assume rdb_async_lock to be locked
void set_async_vector(ISC_STATUS* userStatus) throw();
void reset_async_vector() throw();
ISC_STATUS* get_status_vector() throw();
void set_status_vector(ISC_STATUS* userStatus) throw()
{
rdb_status_vector = userStatus;
}
void status_assert(ISC_STATUS* userStatus)
{
fb_assert(rdb_status_vector == userStatus);
}
void save_status_vector(ISC_STATUS*& save) throw()
{
save = rdb_status_vector;

View File

@ -450,6 +450,7 @@ void NBackup::open_database_scan()
"SEQUENTIAL" << dbname.c_str() << Arg::Unix(rc));
}
#endif // POSIX_FADV_SEQUENTIAL
#ifdef POSIX_FADV_NOREUSE
if (direct_io)
{