Commit c4c6ab23 authored by unknown's avatar unknown
Browse files

Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint 

into  maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint


mysql-test/r/symlink.result:
  Auto merged
mysql-test/t/symlink.test:
  Auto merged
include/my_pthread.h:
  Manual merge
parents 9121fa50 e403f0e7

include/my_pthread.h

+8 −13
Original line number Diff line number Diff line
@@ -76,19 +76,20 @@ typedef void * (__cdecl *pthread_handler)(void *); 
  __int64 i64;

 };

struct timespec {

  union ft64 start;

  union ft64 tv;

  /* The max timeout value in millisecond for pthread_cond_timedwait */

  long timeout_msec;

  long max_timeout_msec;

};

#define set_timespec(ABSTIME,SEC) { \

  GetSystemTimeAsFileTime(&((ABSTIME).start.ft)); \

  (ABSTIME).timeout_msec= (long)((SEC)*1000); \

  GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \

  (ABSTIME).tv.i64+= (__int64)(SEC)*10000000; \

  (ABSTIME).max_timeout_msec= (long)((SEC)*1000); \

}

#define set_timespec_nsec(ABSTIME,NSEC) { \

  GetSystemTimeAsFileTime(&((ABSTIME).start.ft)); \

  (ABSTIME).timeout_msec= (long)((NSEC)/1000000); \

  GetSystemTimeAsFileTime(&((ABSTIME).tv.ft)); \

  (ABSTIME).tv.i64+= (__int64)(NSEC)/100; \

  (ABSTIME).max_timeout_msec= (long)((NSEC)/1000000); \

}

#define get_timespec_sec(ABSTIME) ((((ABSTIME).start.i64 / 10000) + (ABSTIME).timeout_msec ) / 1000)



void win_pthread_init(void);

int win_pthread_setspecific(void *A,void *B,uint length);
@@ -410,9 +411,6 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); 
  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#ifndef get_timespec_sec

#define get_timespec_sec(ABSTIME) (ABSTIME).ts_sec

#endif /* !get_timespec_sec */

#else

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \
@@ -431,9 +429,6 @@ int my_pthread_mutex_trylock(pthread_mutex_t *mutex); 
  (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#ifndef get_timespec_sec

#define get_timespec_sec(ABSTIME) (ABSTIME).tv_sec

#endif /* !get_timespec_sec */

#endif /* HAVE_TIMESPEC_TS_SEC */



	/* safe_mutex adds checking to mutex for easier debugging */

mysql-test/r/symlink.result

+2 −2
Original line number Diff line number Diff line
@@ -115,12 +115,12 @@ show create table t1; 
Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

show create table t1;

Table	Create Table

t1	CREATE TEMPORARY TABLE `t1` (

  `a` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TEST_DIR/var/log/'

) ENGINE=MyISAM DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQLTEST_VARDIR/log/'

create table t1 (a int) engine=myisam select 42 a;

select * from t1;

a

mysql-test/t/symlink.test

+4 −4
Original line number Diff line number Diff line
@@ -147,20 +147,20 @@ connect (session2,localhost,root,,); 


connection session1;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 9 a;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/log" select 9 a;

enable_query_log;

# If running test suite with a non standard tmp dir, the "show create table"

# will print "DATA_DIRECTORY=". Use replace_result to mask it out

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

show create table t1;



connection session2;

disable_query_log;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQL_TEST_DIR/var/log" select 99 a;

eval create temporary table t1 (a int) engine=myisam data directory="$MYSQLTEST_VARDIR/log" select 99 a;

enable_query_log;

# If running test suite with a non standard tmp dir, the "show create table"

# will print "DATA_DIRECTORY=". Use replace_result to mask it out

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR

show create table t1;



connection default;

mysys/my_wincond.c

+10 −9
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex) 
  return 0 ;

}





int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,

                           struct timespec *abstime)

{
@@ -61,22 +62,22 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex, 
  GetSystemTimeAsFileTime(&now.ft);



  /*

    - subtract start time from current time(values are in 100ns units

    Calculate time left to abstime

    - subtract start time from current time(values are in 100ns units)

    - convert to millisec by dividing with 10000

    - subtract time since start from max timeout

  */

  timeout= abstime->timeout_msec - (long)((now.i64 - abstime->start.i64) / 10000);

  timeout= (long)((abstime->tv.i64 - now.i64) / 10000);

  

  /* Don't allow the timeout to be negative */

  if (timeout < 0)

    timeout= 0L;



  /*

    Make sure the calucated time does not exceed original timeout

    Make sure the calucated timeout does not exceed original timeout

    value which could cause "wait for ever" if system time changes

  */

  if (timeout > abstime->timeout_msec)

    timeout= abstime->timeout_msec;

  if (timeout > abstime->max_timeout_msec)

    timeout= abstime->max_timeout_msec;



  InterlockedIncrement(&cond->waiting);

  LeaveCriticalSection(mutex);