serg@sergbook.mysql.com
b37c197512
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
2007-03-23 14:57:55 +02:00
serg@sergbook.mysql.com
2220fe2774
move thr_client_alarm initialization to mysqld.cc
...
(in thr_alarm.cc it happened too late).
2007-03-23 13:38:42 +02:00
msvensson@pilot.blaudden
da9fa2cfeb
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 11:31:22 +01:00
msvensson@pilot.blaudden
aed2a676a7
Merge pilot.blaudden:/home/msvensson/mysql/bug26233/my50-bug26233
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-23 11:26:00 +01:00
joerg@trift2.
4ab912c92a
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:10:27 +01:00
msvensson@pilot.blaudden
593ef42606
Bug#26233 very suspect code in mf_tempfile.c, in function create_temp_file()
...
- Rework the windows implementation in 'create_temp_file' to be
thread safe by using GetTempFileName instad of fiddling
with "environ"
2007-03-23 11:01:47 +01:00
jani@ua141d10.elisa.omakaista.fi
5c542a4656
Fixed compiler warnings.
2007-03-22 20:32:07 +02:00
kent@mysql.com/kent-amd64.(none)
056356db05
Makefile.am:
...
Don't install benchmark executable
CMakeLists.txt:
Handle CMAKE_C_FLAGS_RELWITHDEBINFO and CMAKE_CXX_FLAGS_RELWITHDEBINFO
2007-03-22 16:53:37 +01:00
iggy@recycle.(none)
988ce58052
Bug#23736 Pointer free error in mysqlbinlog
...
- Mis-matched SAFEMALLOC defines caused misleading error message.
2007-03-20 10:34:25 -04:00
tsmith@quadxeon.mysql.com
6252477a7b
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
2007-03-19 23:10:58 +01:00
kent@mysql.com/kent-amd64.(none)
43cc303b26
Makefile.am, CMakeLists.txt:
...
Removed references to my_winsem.c
2007-03-12 14:52:37 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618
Merge mysql.com:/home/kent/bk/tmp/mysql-4.0
...
into mysql.com:/home/kent/bk/tmp/mysql-4.1-build
2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170
Makefile.am, configure.in, mysys.dsp:
...
Removed unused files
.del-my_winsem.c:
Delete: mysys/my_winsem.c
.del-my_semaphore.c:
Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
Delete: include/my_semaphore.h
2007-03-12 13:12:42 +01:00
Kristofer.Pettersson@naruto.
ab28345a4b
Merge naruto.:C:/cpp/bug25042/my50-bug25042
...
into naruto.:C:/cpp/mysql-5.0-maint
2007-03-09 08:02:29 +01:00
iggy@recycle.(none)
d3bdfa2c30
Bug#25222 Win32 HANDLE leak in my_sopen()
...
- When attempting to associate a Windows File handle to a C run-time file
handle there is an upper bound. Once reached, the newly created handles
will cause a memory leak since they are not properly associated with a
handle that can later be cleaned up.
2007-03-07 10:46:38 -05:00
msvensson@pilot.blaudden
f5778fc73e
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-03-01 18:12:56 +01:00
monty@mysql.com/narttu.mysql.fi
e5cc397f33
Fixed compiler warnings (for linux and win32 and win64)
...
Fixed a couple of usage of not initialized warnings (unlikely cases)
2007-02-22 16:59:57 +02:00
monty@mysql.com/narttu.mysql.fi
26aa385bc5
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2007-02-21 14:07:08 +02:00
joerg@trift2.
74fed0c305
After-merge fix:
...
The declaration of "thr_client_alarm" had got lost, keep it in "mysys/thr_alarm.c".
2007-02-20 13:10:27 +01:00
joerg@trift2.
0daf91a62a
Merge trift2.:/MySQL/M40/clone-4.0
...
into trift2.:/MySQL/M41/merge-4.1
2007-02-20 13:02:39 +01:00
msvensson@pilot.blaudden
0b5c41acc7
Bug#25807 LOAD DATA INFILE does not work with Pipes
...
- Additional fix for io_cache_init being called on a closed file
2007-02-20 12:06:04 +01:00
istruewing@chilla.local
0f4a84f002
Fixed a bad merge. Got a duplicate symbol on OSX.
2007-02-20 10:01:54 +01:00
istruewing@chilla.local
97c6a6c4e8
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-16 10:39:45 +01:00
Kristofer.Pettersson@naruto.
cd0a43f528
Bug#25042 OPTIMIZE TABLE cause race condition in IO CACHE SHARE
...
- The condition variable implementation "lost" a signal to
WaitOnSingleObject when a semaphore was released.
- The signal could be consumed by a new call to pthread_cond_wait
before all waiting threads had awoken.
- The new implementation of pthread_cond_* uses events
instead of semaphores. It also uses an extra lock to protect entry
into new cond wait before the broadcast has finished.
2007-02-15 14:08:21 +01:00
cmiller@zippy.cornsilk.net
154f7f396e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-02-14 10:47:39 -05:00
istruewing@chilla.local
aba12aca0f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-14 12:02:58 +01:00
ibabaev@bk-internal.mysql.com
266300142e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-02-13 23:35:06 +01:00
cmiller@zippy.cornsilk.net
9e9dd4327c
Bug#25807: LOAD DATA INFILE does not work with Pipes
...
Showstopper and regression against 5.0.24.
Previously, we ignored seek() errors (see Bug#22828) and let seek()s
against pipes fail. Now, since we check that a seek didn't fail,
and return without reading, this bug popped up.
This restores the behavior for file-ish objects that could never be
seek()ed.
2007-02-13 16:35:29 -05:00
joerg@trift2.
0ba571bac3
Fix a linkage problem with the previous patch for "thr_client_alarm".
2007-02-12 20:13:34 +01:00
joerg@trift2.
aa59e423d7
Break a double declare of "uint thr_client_alarm" between "mysys/thr_alarm.c" and "mysys/my_pthread.c".
2007-02-12 19:55:33 +01:00
joerg@trift2.
dd745750e5
Compile error on Windows: Signal names are undefined. Fix by hiding the whole section.
2007-02-12 15:03:11 +01:00
gkodinov/kgeorge@macbook.gmz
35a84c0aa6
Fixed MacOSX/Intel linking problem
...
Common symbols with and without initialization
cause the apple linker to exclude then from the
list of global symbols.
2007-02-12 16:02:53 +02:00
tsmith@siva.hindu.god
4579445b2a
Merge siva.hindu.god:/home/tsmith/m/bk/41
...
into siva.hindu.god:/home/tsmith/m/bk/maint/41
2007-02-08 16:01:13 -07:00
antony@ppcg5.local
18ce758819
thd_lib_detected moved so that it is correctly declared as a data
...
section symbol and not a common symbol on gcc 4.0.1 on darwin 8.8.0
PowerPC MacOS X 10.4.8
2007-02-06 15:19:01 -08:00
msvensson@neptunus.(none)
ede3afe470
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2007-02-06 14:45:08 +01:00
msvensson@pilot.mysql.com
256cb08ba9
Merge 192.168.0.10:mysql/mysql-4.1-maint
...
into pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint
2007-02-06 14:44:05 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
1dd93dda08
Test and bug fixes and removed unneccessary files.
2007-02-05 17:09:44 +02:00
istruewing@chilla.local
1616e201d8
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 10:03:22 +01:00
istruewing@chilla.local
3a664472de
After merge fix
2007-02-02 10:01:44 +01:00
istruewing@chilla.local
1c34270464
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 10:19:22 +01:00
istruewing@chilla.local
73e61944f7
Merge chilla.local:/home/mydev/mysql-4.0-axmrg
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 08:09:36 +01:00
cmiller@zippy.cornsilk.net
a795b7097f
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-4.1-maint
2007-01-31 16:26:12 -05:00
cmiller@zippy.cornsilk.net
ad66e7a0dd
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-01-31 16:23:05 -05:00
jani/jamppa@production.mysql.com
0e9a64684d
Merge bk://localhost:5559
...
into production.mysql.com:/usersnfs/jamppa/mysql-4.0
2007-01-30 17:52:27 +01:00
jani@ua141d10.elisa.omakaista.fi
b3523e398c
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-30 18:52:26 +02:00
istruewing@chilla.local
42bd03e254
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-01-29 18:47:46 +01:00
mtaylor@qualinost.(none)
f8f11eb2d9
Reverting change adding /etc/mysql support, as it breaks some installs.
2007-01-26 12:17:50 -08:00
mtaylor@qualinost.(none)
58ae89cb76
User visible change - breaks some environments, per Paul DuBois. Reverting in 4.1 and 5.0.
2007-01-26 12:00:38 -08:00
jani@ua141d10.elisa.omakaista.fi
0b4ee9e5b8
Cleanup of thread-type (linuxthread or NTPL) detection code
...
Move get_thread_lib to mysys/my_pthread.c
Set 'thr_client_alarm' to signal number used by thr_alarm to give alarms
2007-01-25 20:10:31 +02:00