Commit a70b4627 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-5.1-maint 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint


client/mysqltest.c:
  Auto merged
mysql-test/r/archive.result:
  Auto merged
mysql-test/t/archive.test:
  SCCS merged
parents eb3b8c3c 33ab28e9

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ inline double ulonglong2double(ulonglong value) 
#define tell(A) _telli64(A)

#endif



#define set_timespec(ABSTIME,SEC) { (ABSTIME).tv_sec=time((time_t*)0) + (time_t) (SEC); (ABSTIME).tv_nsec=0; }



#define STACK_DIRECTION -1

include/my_global.h

+1 −35
Original line number Diff line number Diff line
@@ -1106,41 +1106,7 @@ typedef char bool; /* Ordinary boolean values 0 1 */ 
#define MY_HOW_OFTEN_TO_ALARM	2	/* How often we want info on screen */

#define MY_HOW_OFTEN_TO_WRITE	1000	/* How often we want info on screen */



#ifdef HAVE_TIMESPEC_TS_SEC

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{ \

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).ts_sec=  (now / ULL(10000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#else

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{\

  struct timeval tv;\

  gettimeofday(&tv,0);\

  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).tv_sec=  (time_t) (now / ULL(10000000));                  \

  (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#endif /* HAVE_TIMESPEC_TS_SEC */





/*

  Define-funktions for reading and storing in machine independent format

include/my_pthread.h

+69 −2
Original line number Diff line number Diff line
@@ -66,6 +66,34 @@ typedef int pthread_mutexattr_t; 
#define pthread_handler_t EXTERNC void * __cdecl

typedef void * (__cdecl *pthread_handler)(void *);



/*

  Struct and macros to be used in combination with the

  windows implementation of pthread_cond_timedwait

*/



/*

   Declare a union to make sure FILETIME is properly aligned

   so it can be used directly as a 64 bit value. The value

   stored is in 100ns units.

 */

 union ft64 {

  FILETIME ft;

  __int64 i64;

 };

struct timespec {

  union ft64 start;

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

  long timeout_msec;

};

#define set_timespec(ABSTIME,SEC) { \

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

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

}

#define set_timespec_nsec(ABSTIME,NSEC) { \

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

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

}



void win_pthread_init(void);

int win_pthread_setspecific(void *A,void *B,uint length);

int pthread_create(pthread_t *,pthread_attr_t *,pthread_handler,void *);
@@ -141,8 +169,6 @@ void pthread_exit(void *a); /* was #define pthread_exit(A) ExitThread(A)*/ 
#define pthread_condattr_init(A)

#define pthread_condattr_destroy(A)



/*Irena: compiler does not like this: */

/*#define my_pthread_getprio(pthread_t thread_id) pthread_dummy(0) */

#define my_pthread_getprio(thread_id) pthread_dummy(0)



#else /* Normal threads */
@@ -367,6 +393,47 @@ void my_pthread_attr_getstacksize(pthread_attr_t *attrib, size_t *size); 
int my_pthread_mutex_trylock(pthread_mutex_t *mutex);

#endif



/*

  The defines set_timespec and set_timespec_nsec should be used

  for calculating an absolute time at which

  pthread_cond_timedwait should timeout

*/

#ifdef HAVE_TIMESPEC_TS_SEC

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{ \

  (ABSTIME).ts_sec=time(0) + (time_t) (SEC); \

  (ABSTIME).ts_nsec=0; \

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{ \

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).ts_sec=  (now / ULL(10000000)); \

  (ABSTIME).ts_nsec= (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#else

#ifndef set_timespec

#define set_timespec(ABSTIME,SEC) \

{\

  struct timeval tv;\

  gettimeofday(&tv,0);\

  (ABSTIME).tv_sec=tv.tv_sec+(time_t) (SEC);\

  (ABSTIME).tv_nsec=tv.tv_usec*1000;\

}

#endif /* !set_timespec */

#ifndef set_timespec_nsec

#define set_timespec_nsec(ABSTIME,NSEC) \

{\

  ulonglong now= my_getsystime() + (NSEC/100); \

  (ABSTIME).tv_sec=  (time_t) (now / ULL(10000000));                  \

  (ABSTIME).tv_nsec= (long) (now % ULL(10000000) * 100 + ((NSEC) % 100)); \

}

#endif /* !set_timespec_nsec */

#endif /* HAVE_TIMESPEC_TS_SEC */



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



#if defined(__NETWARE__) && !defined(SAFE_MUTEX_DETECT_DESTROY)

mysql-test/r/myisam.result

+21 −0
Original line number Diff line number Diff line
@@ -922,6 +922,27 @@ SET @@myisam_repair_threads=1; 
SHOW VARIABLES LIKE 'myisam_repair%';

Variable_name	Value

myisam_repair_threads	1

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/'

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/'

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

select * from t1;

a

9

select * from t1;

a

99

select * from t1;

a

42

drop table t1;

set storage_engine=MyISAM;

drop table if exists t1,t2,t3;

--- Testing varchar ---

mysql-test/t/archive.test

+1 −0
Original line number Diff line number Diff line
@@ -1346,6 +1346,7 @@ SELECT * FROM t2; 
CHECK TABLE t2;

SELECT * FROM t2;





# Test INSERT DELAYED and wait until the table has one more record

SELECT COUNT(auto) FROM t2;

INSERT DELAYED INTO t2 VALUES (4,011403,37,'intercepted','audiology','tinily','');