tsmith@siva.hindu.god
6b729ff2cd
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 10:30:39 -07:00
lars/lthalmann@dl145j.mysql.com
1e356251a0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-01-12 12:31:44 +01:00
tsmith/tim@siva.hindu.god
0cb9cee7f4
Merge siva.hindu.god:/usr/home/tim/m/bk/g51
...
into siva.hindu.god:/usr/home/tim/m/bk/tmp/mrg51-dec26
2006-12-26 16:49:10 -07:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
msvensson@maint1.mysql.com
8c3dab2f5d
Merge maint1.mysql.com:/data/localhome/msvensson/mysql-5.0-maint
...
into maint1.mysql.com:/data/localhome/msvensson/mysql-5.1-new-maint
2006-12-18 14:27:51 +01:00
msvensson@shellback.
c3fb91b782
Change windows pthread_cond_timedwait to use an absolute time value
2006-12-18 11:09:47 +01:00
msvensson@shellback.
fe341ad904
Add macro for retrieving sec part of "struct timespec"
...
Use macros for working with "struct timespec" in event_queue.cc
Fix merge problem
2006-12-15 10:41:24 +01:00
tsmith/tim@siva.hindu.god
1feb188721
include/my_pthread.h: Fix botched merge - add struct timespec and set_timespec(), etc.
2006-12-14 15:36:45 -07:00
msvensson@shellback.
c41e307d85
BUG#24687 func_misc test fails on win64
...
- Use same precision (milliseconds) for all time functions
used when calculating time for pthread_cond_timedwait
- Use 'GetSystemTimeAsFileTime' for both start and curr time
2006-12-14 15:23:44 +01:00
lars@black.(none)
4d25b1e1c2
Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
...
into mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-12-08 23:54:45 +01:00
lars@mysql.com/black.(none)
e2e3f0e5c3
Merge mysql.com:/home/bkroot/mysql-5.0-rpl
...
into mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-12-08 23:33:39 +01:00
rafal@quant.(none)
c82cd4a46e
Minor fix
2006-12-08 19:23:12 +01:00
rafal@quant.(none)
5d7af856f7
BUG#24507 (rpl_log.test crash slave):
...
The problem was located to lie inside current NPTL pthread_exit()
implementation. Race conditions in this code can lead to segmentation
fault. Hovewer, this can happen only in a race between first thread
calling pthread_exit() and other threads.
Workaround implemented in this patch spawns a dummy thread, which
exits immediately, during thread lib initialization. This will exclude
segment violations when further threads exit.
2006-12-08 11:41:12 +01:00
monty@narttu.mysql.fi
693b906f6e
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-11-30 23:27:16 +02:00
monty@narttu.mysql.fi
717284b85c
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2006-11-29 23:07:15 +02:00
monty@mysql.com/narttu.mysql.fi
0bee93e038
Ignore some generated files
...
Don't return from my_thread_global_end() until all threads have called my_thread_end()
Bug#24387: Valgrind: my_thread_init (handle_sl sql, handle_one_conn, handle_slave_io)
2006-11-29 22:14:08 +02:00
anozdrin/alik@booka.
0a1a704f17
Make IM compiled on Win32: add pthread_join() impl.
2006-11-22 17:14:43 +03:00
jimw@mysql.com
8262c3c38e
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-19 19:07:33 -07:00
msvensson@neptunus.(none)
f186a3f24e
Merge neptunus.(none):/home/msvensson/mysql/my41-bug13711
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-05-19 13:09:15 +02:00
msvensson@neptunus.(none)
b9a59fa014
Bug#15869 Cannot shutdown the server - it restarts
...
- A segfault occured when the function 'kill_server' called
'my_sigset' with signal number 0. 'my_sigset' is a macro which
uses 'sigaction' to install the signal handler with an invalid
signal number will on most platforms return EINVAL but yields
a segfauilt on IRIX 6.5
- The server crash was detected by mysqld_safe and it was restarted although
a shutdown was requested.
- Semantics of kill_server(0) is not known, leaving it intact
2006-05-19 13:07:24 +02:00
brian@zim.(none)
6f986a344b
UNIXWARE removal
2006-04-17 15:56:59 -07:00
brian@zim.(none)
f6f03576c6
This completes the work done in 5.0 to remove mit_pthread support (most was pulled in 5.0, but there were some pieces left in the tree)
2006-04-16 01:50:25 -07:00
brian@zim.(none)
ba2502b9c3
Another long patch to remove the rest of the OS2 support.
2006-04-15 08:49:00 -07:00
knielsen@mysql.com
9c84881310
Define USE_TLS when compiling libmysql.dll, to avoid crashing when
...
loaded at runtime.
2006-03-22 09:55:26 +01:00
vtkachenko@melody.mysql.com
22c930c924
Fast mutexes implementation
...
(spin-loop inside pthread_mutex_lock).
thr_mutex.c:
Added spinloop in mutex_lock
my_pthread.h:
Added definition of my_pthread_fastmutex_t
configure.in:
Added --with-fast-mutexes switch
2005-12-20 14:56:45 +01:00
kent@mysql.com
9f399bbabd
my_pthread.h:
...
Bug#15629: Increased thread stack for all 64 bit platforms,
else test case 'sp' and 'call fib(20)' gives stack overrun
2005-12-13 00:45:32 +01:00
ingo@mysql.com
74781d6559
Bug#14397 - OPTIMIZE TABLE with an open HANDLER causes a crash
...
Version for 5.0.
It fixes three problems:
1. The cause of the bug was that we did not check the table version for
the HANDLER ... READ commands. We did not notice when a table was
replaced by a new one. This can happen during ALTER TABLE, REPAIR
TABLE, and OPTIMIZE TABLE (there might be more cases). I call the fix
for this problem "the primary bug fix".
2. mysql_ha_flush() was not always called with a locked LOCK_open.
Though the function comment clearly said it must.
I changed the code so that the locking is done when required. I call
the fix for this problem "the secondary fix".
3. In 5.0 (not in 4.1 or 4.0) DROP TABLE had a possible deadlock flaw in
concur with FLUSH TABLES WITH READ LOCK. I call the fix for this
problem "the 5.0 addendum fix".
2005-11-15 21:57:02 +01:00
reggie@big_geek.
dec2640dbf
changed define from EXTERN_C to EXTERNC so it doesn't conflict with
...
another macro defined in the Windows header files.
2005-10-25 23:51:05 -05:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
jimw@mysql.com
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
serg@serg.mylan
e91712d9bb
pthread_handler_decl() changed to be ctags-friendly
...
(and contain extern "C" when necessary)
2005-10-08 16:39:55 +02:00
kent@mysql.com
3af12c4776
my_pthread.h:
...
Let pthread_mutex_init() macro return 0 on Windows
mysql_priv.h:
Return type is to be 'my_bool' for 'opt_enable_shared_memory'
2005-10-06 03:49:14 +02:00
jimw@mysql.com
a60ed0b75d
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
jimw@mysql.com
16e5f22162
Merge mysqldev@production.mysql.com:jimw/mysql-4.1-sco
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-12 10:19:56 -07:00
jimw@mysql.com
a540a66b26
Port to SCO OpenServer 6. May require running ./configure with
...
--build=i686-unknown-sysv5SCO_SV6.0.0
2005-09-07 20:23:07 +02:00
msvensson@neptunus.(none)
e6293c49c4
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 13:30:00 +02:00
msvensson@neptunus.(none)
565e660bd4
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Reverted removal of errorcheck mutex initialise, used in safe_mutex_init.
2005-04-27 13:29:37 +02:00
msvensson@neptunus.(none)
203cdde955
Merge from 4.1 to 5.0
2005-04-27 12:56:01 +02:00
msvensson@neptunus.(none)
f3c72cc891
Bug #9954 mysql-4.1.11/cmd-line-utils/libedit/makelist.sh is not portable
...
- Changed makelist.sh
- Bump up required version of autoconf
- Use new style to init mutex in my_thr_init
2005-04-27 09:59:12 +02:00
serg@serg.mylan
810b2c3d40
remove the rest of isam/merge references
...
fix a race condition in TC_LOG_BINLOG::unlog
2005-04-05 13:17:49 +02:00
serg@serg.mylan
fd828e5b4d
manually merged
2005-02-14 21:50:09 +01:00
ingo@mysql.com
601a4fdfa2
Merge
2005-02-11 11:59:35 +01:00
ingo@mysql.com
35f65c5a06
Bug#8391 - "merge" fails on Linux/IA64
...
It was a thread stack overrun.
IA64 had its own stack size section already.
Enlarged its default stack size from 192K to 256K.
2005-02-10 16:56:57 +01:00
serg@serg.mylan
3c5060981f
query_id and my_xid -> ulonglong
...
fix for binlog+autocommit+tclog
comments, style fixes
2005-01-27 22:38:56 +01:00
serg@serg.mylan
1034677f94
XA (not completely polished out yet)
2005-01-16 13:16:23 +01:00
serg@sergbook.mysql.com
f472cec178
merged
2005-01-06 19:32:16 +02:00
lenz@mysql.com
6b6a11f85b
- Manually merged two changes from 4.0
2005-01-06 15:32:42 +01:00
jimw@mysql.com
c1593ecf66
Allow DEFAULT_THREAD_STACK to be set via -DDEFAULT_THREAD_STACK=... so our
...
official binary builds for Linux that are built against a static glibc with
a 128k thread stack size limit can be compiled with a default that doesn't
result in a harmless (but oft-misunderstood) warning message. (Bug #6226 )
2005-01-05 19:02:17 +01:00
serg@serg.mylan
431b93609c
#warning removed
...
AC_FUNC_MMAP changes to AC_CHECK_FUNCS(mmap)
2004-11-17 14:38:01 +01:00