Commit 8bf5ea3a authored by serg@sergbook.mysql.com's avatar serg@sergbook.mysql.com
Browse files

Merge work:/home/bk/mysql-4.0 

into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0
parents dc8d7e03 e5b02fbe

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -67,3 +67,4 @@ venu@work.mysql.com 
worm@altair.is.lan

zak@balfor.local

zak@linux.local

salle@geopard.(none)

Docs/manual.texi

+40 −0
Original line number Diff line number Diff line
@@ -49578,6 +49578,46 @@ Our TODO section contains what we plan to have in 4.0. @xref{TODO MySQL 4.0}. 














@itemize @bullet















@item













Added binary XOR. 

























The one that with a query like :

























@example













SELECT 11 ^ 3;













@end example

























returns 8.

























Based on code contributed by Hartmut Holzgraefe @email{hartmut@@six.de}.













@item

























Added logical XOR.

























The one that with a query like:

























@example













SELECT 1 XOR 1;













@end example

























returns 0;

























Based on code contributed by Hartmut Holzgraefe @email{hartmut@@six.de}.













@item













Add function @code{CHECK_LOCK("lock_name")}. 













This function returns a value indicating whether or not the lock with the













given name is available. 













It does not attempt to acquire a lock.













It is used like this:

























@example













SELECT CHECK_LOCK("some_lock");













@end example

























@code{CHECK_LOCK()} returns 1 if the lock is available,













0 if the lock is held by any process (including the current process),













and @code{NULL} if an error occurs.













Based on code contributed by Hartmut Holzgraefe @email{hartmut@@six.de}.













@item















Removed @code{mysql_ssl_clear()}, as this was not needed.















@item















@code{DECIMAL} and @code{NUMERIC} types can now read exponential numbers.

























include/my_global.h



+1
−1






























Original line number
Diff line number
Diff line








@@ -313,7 +313,7 @@ typedef unsigned short ushort;













#define rint(A) floor((A)+0.5)















#endif





























/* Define som general constants */













/* Define some general constants */















#ifndef TRUE















#define TRUE		(1)	/* Logical true */















#define FALSE		(0)	/* Logical false */

































include/my_pthread.h



+6
−0






























Original line number
Diff line number
Diff line








@@ -485,6 +485,8 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,













#define my_rwlock_init(A,B) pthread_mutex_init((A),(B))















#define rw_rdlock(A) pthread_mutex_lock((A))















#define rw_wrlock(A) pthread_mutex_lock((A))













#define rw_tryrdlock(A) pthread_mutex_trylock((A))













#define rw_trywrlock(A) pthread_mutex_trylock((A))















#define rw_unlock(A) pthread_mutex_unlock((A))















#define rwlock_destroy(A) pthread_mutex_destroy((A))















#elif defined(HAVE_PTHREAD_RWLOCK_RDLOCK)









@@ -492,6 +494,8 @@ int safe_cond_timedwait(pthread_cond_t *cond, safe_mutex_t *mp,













#define my_rwlock_init(A,B) pthread_rwlock_init((A),(B))















#define rw_rdlock(A) pthread_rwlock_rdlock(A)















#define rw_wrlock(A) pthread_rwlock_wrlock(A)













#define rw_tryrdlock(A) pthread_mutex_tryrdlock((A))













#define rw_trywrlock(A) pthread_mutex_trywrlock((A))















#define rw_unlock(A) pthread_rwlock_unlock(A)















#define rwlock_destroy(A) pthread_rwlock_destroy(A)















#elif defined(HAVE_RWLOCK_INIT)









@@ -512,6 +516,8 @@ typedef struct _my_rw_lock_t {













#define rw_lock_t my_rw_lock_t















#define rw_rdlock(A) my_rw_rdlock((A))















#define rw_wrlock(A) my_rw_wrlock((A))













#define rw_tryrdlock(A) my_rw_tryrdlock((A))













#define rw_trywrlock(A) my_rw_trywrlock((A))















#define rw_unlock(A) my_rw_unlock((A))















#define rwlock_destroy(A) my_rwlock_destroy((A))

















































include/my_sys.h



+0
−7






























Original line number
Diff line number
Diff line








@@ -750,13 +750,6 @@ byte *my_compress_alloc(const byte *packet, ulong *len, ulong *complen);













ulong checksum(const byte *mem, uint count);















uint my_bit_log2(ulong value);





























#if defined(SAFE_MUTEX) && !defined(DBUG_OFF)













#define DBUG_ASSERT_LOCK(lock) DBUG_ASSERT((lock)->count == 1 && \













				   (lock)->thread == pthread_self())













#else













#define DBUG_ASSERT_LOCK(lock)













#endif





























#if defined(_MSC_VER) && !defined(__WIN__)















extern void sleep(int sec);















#endif