svoj@mysql.com/june.mysql.com
122167bb4b
Merge mysql.com:/home/svoj/devel/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-05-23 12:39:33 +05:00
svoj@mysql.com/june.mysql.com
8a809def0a
Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
2007-05-17 15:27:56 +05:00
svoj@mysql.com/june.mysql.com
f6a111dfef
Addition to fix for
...
BUG#25712 - insert delayed and check table run together report crashed
tables
Fixed wrongly applied patch.
2007-05-17 15:23:59 +05:00
svoj@mysql.com/april.(none)
bf473b1069
Merge mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-4.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25712/mysql-5.0-engines
2007-05-17 00:40:26 +05:00
svoj@mysql.com/april.(none)
3ea2ee357b
BUG#25712 - insert delayed and check table run together report crashed
...
tables
In case system doesn't have native pread/pwrite calls (e.g. Windows)
and there is CHECK TABLE runs concurrently with another statement that
reads from a table, the table may be reported as crashed.
This is fixed by locking file descriptor when my_seek is executed on
MyISAM index file and emulated pread/pwrite may be executed concurrently.
Affects MyISAM tables on platforms that do not have native
pread/pwrite calls (e.g. Windows).
No deterministic test case for this bug.
2007-05-16 23:42:32 +05:00
dkatz@damien-katzs-computer.local
b578abc0c1
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50_frm_files
2007-04-30 17:04:14 -04:00
tsmith@quadxeon.mysql.com
b90b0c7eb2
Bug #27390 : mysqld_multi --config-file= not working as documented
...
Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options. Treat old --config-file argument as if --defaults-extra-file
had been specified instead.
Plus a few other defaults-related cleanups.
2007-04-28 01:27:54 +02:00
cmiller@zippy.cornsilk.net
0b69216315
Avoid compiler warnings.
2007-04-20 13:49:06 -04:00
cmiller@zippy.cornsilk.net
28b3218e45
Bug #27964 : pthread_key_create doesn't set errno, so don't report \
...
errno
Vasil Dimov (at Oracle) noted that pthread_key_create() does not
set errno, so if it fails then we return the wrong error code.
Instead, capture the return value, which is the real error value,
and instead report that.
2007-04-19 17:07:11 -04:00
dkatz@damien-katzs-computer.local
cbcb418f76
Bug #25761 Table is partially created when disk is full, causing database corruption
2007-04-19 13:41:12 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
df75e6e50e
Merge mysql.com:/home/ram/work/mysql-5.0-maint
...
into mysql.com:/home/ram/work/b26851/b26851.5.0
2007-04-19 11:45:26 +05:00
tsmith@siva.hindu.god
39496731a2
Merge siva.hindu.god:/home/tsmith/m/bk/50
...
into siva.hindu.god:/home/tsmith/m/bk/maint/50
2007-04-18 14:50:32 -06:00
dkatz@damien-katzs-computer.local
138f003738
Merge damien-katzs-computer.local:/Users/dkatz/mysql50
...
into damien-katzs-computer.local:/Users/dkatz/50b
2007-04-16 13:49:17 -04:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
e62dbcf746
Fix for
...
bug #27715 : mysqld --character-sets-dir buffer overflow
bug ##26851: Mysql Client --pager Buffer Overflow
Using strmov() to copy an argument may cause overflow
if the argument's length is bigger than the buffer:
use strmake instead.
Also, we have to encrease the error message buffer size to fit
the longest message.
2007-04-16 12:28:02 +05:00
jani@a88-113-38-195.elisa-laajakaista.fi
c66f50fa68
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/new/mysql-5.0-marvel
2007-04-13 09:04:34 +03:00
dkatz@damien-katzs-computer.local
dac9f99327
Bug #27322 failure to allocate transaction_prealloc_size causes crash
...
Fix for when memory pre-allocation fails.
2007-04-12 18:03:26 -04:00
jani@ua141d10.elisa.omakaista.fi
335153121b
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-04-12 12:50:02 +03:00
kent@mysql.com/kent-amd64.(none)
8bcdaa86cf
my_memmem.c:
...
Back port of include change and copyright from 5.1
Makefile.am, zlib.m4:
Use separate libtool convenience library for the bundled
zlib to embed into executables and shared libraries created,
and one to install into the pkglib directory
2007-04-11 01:47:42 +02:00
joerg@trift2.
22f066e354
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-04-07 20:46:43 +02:00
kent@mysql.com/kent-amd64.(none)
6249bb34a4
Merge mysql.com:/home/kent/bk/sotest/mysql-4.1-build
...
into mysql.com:/home/kent/bk/sotest/mysql-5.0-build
2007-04-05 08:30:49 +02:00
kent@mysql.com/kent-amd64.(none)
8cc67c011e
Deleted reject files accidently checked in
...
configure.in.rej
include/my_global.h.rej
BUILD/SETUP.sh.rej
mysys/thr_alarm.c.rej
include/my_pthread.h.rej
2007-04-05 08:30:16 +02:00
msvensson@pilot.blaudden
bb9a601829
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-02 10:50:39 +02:00
serg@janus.mylan
00f383ff18
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
...
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
2007-04-02 09:21:19 +02:00
svoj@mysql.com/april.(none)
75f0416532
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
2007-03-29 21:50:54 +05:00
jani@ua141d10.elisa.omakaista.fi
3c3b0391f8
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-main
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
2007-03-28 20:46:42 +03:00
kaa@polly.local
8ef841e416
Merge polly.local:/tmp/maint/bug26844/my50-bug26844
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-03-28 20:16:23 +04:00
svoj@mysql.com/april.(none)
aa3e8eac97
BUG#25521 - optimize table, delete, show table status leads to table
...
losing it's .MYD
When OPTIMIZE TABLE is completed it attempts to rename temporary
file to original name. This step may fail on windows when a file
is opened. As a result data file might be deleted and optimized
copy of file (table_name.MYD) remains.
This situation is handled properly by my_delete_allow_opened, so
use it instead of my_delete when attempting to rename a file on
windows.
No suitable test case for this bug.
2007-03-28 21:09:16 +05:00
jani@ua141d10.elisa.omakaista.fi
e12ad391b5
Fixes for 4.1 to be as in 5.0 and above.
2007-03-27 18:51:02 +03:00
kaa@polly.local
729a405908
Fix for bug #26844 "Memory allocation failures ignored by slave IO thread".
...
Pass ME_NOREFRESH flag to an error handler in my_malloc() and _mymalloc() in case of memory allocation failure, so that it gets logged to the error log.
2007-03-26 13:31:23 +04:00
serg@sergbook.mysql.com
e4164cda68
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 20:39:34 +02:00
serg@sergbook.mysql.com
d2d72bfc58
reverted linuxthreads thr_client_alarm fix (not future-proof)
...
fixed differently: wake up select_thread with THR_SERVER_ALARM instead
2007-03-23 20:37:20 +02:00
serg@sergbook.mysql.com
3e9d98b039
Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.1
...
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.0-build
2007-03-23 16:37:19 +02:00
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