jani@ua141d10.elisa.omakaista.fi
e40d3631a3
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-04 21:25:39 +03:00
jani@ua141d10.elisa.omakaista.fi
e4fde44948
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-04-03 14:51:32 +03:00
jamppa@bk-internal.mysql.com
879725900b
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-04-03 13:51:31 +02:00
kostja@bodhi.local
93d0316f45
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-04-03 14:34:37 +04:00
istruewing@chilla.local
facba6ba3a
Post merge fix
2007-03-30 09:14:11 +02:00
istruewing@chilla.local
a4ad591dd8
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-30 07:46:52 +02:00
svoj@april.(none)
310f12591b
Merge mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG25521/mysql-5.1-engines
2007-03-29 22:01:51 +05: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
b8d6c2e970
Merged from 5.0
2007-03-29 19:31:42 +03:00
jani@ua141d10.elisa.omakaista.fi
28c122a721
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-29 17:45:56 +03:00
jani@ua141d10.elisa.omakaista.fi
1c7beca65e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-29 17:27:42 +03:00
jamppa@bk-internal.mysql.com
16de7d21cc
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-marvel
2007-03-29 16:11:29 +02: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
joerg@trift-lap.fambruehe
385526f768
mysys/my_thr_init.c : Avoid warnings of "unused variable" by extending a '#ifdef'.
2007-03-28 19:01:49 +02: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
istruewing@chilla.local
350c5da724
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-03-28 16:57:08 +02:00
istruewing@chilla.local
85dce4b8f8
restored run-time thread lib detection
2007-03-28 16:23:44 +02:00
serg@janus.mylan
e5b660487b
restored run-time thread lib detection
2007-03-28 15:33:29 +02:00
kostja@bodhi.local
e5d6b0afd2
Fix warnings.
2007-03-27 21:57:33 +04:00
kostja@bodhi.local
e56c6d2f25
Change find_type family to accept const TYPELIB*.
2007-03-27 20:27:58 +04: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
svoj@mysql.com/april.(none)
1b64741b9d
BUG#24566 - Incorrect key file for table ( the size of table is more than 2G)
...
Accessing a file that is bigger than 2G may report that read/write operation
failed. This may affect anything that uses my_pread/my_pwrite functions, e.g.
MyISAM, ARCHIVE, binary log.
For MyISAM INSERT may report that table is crashed when writing to a table
that is bigger than 2G.
This is fixed by using proper offset type in my_pread/my_pwrite functions on
systems that do not have native pread/pwrite calls.
Affects systems that do not have native pread/pwrite calls, e.g. Windows.
No test case for this fix, since it requires huge table.
2007-03-25 00:24:39 +04:00
monty@narttu.mysql.fi
28a05d3b33
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into mysql.com:/home/my/mysql-5.1
2007-03-24 11:06:09 +02: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
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
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)
13398ccb5a
Post Merge Fix.
2007-03-20 16:01:38 -04:00
iggy@recycle.(none)
a56b04476a
Merge recycle.(none):/src/bug23736/my50-bug23736
...
into recycle.(none):/src/bug23736/my51-bug23736
2007-03-20 10:54:56 -04: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
jani@ua141d10.elisa.omakaista.fi
6e9add70ec
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-03-19 11:22:10 +02:00
jani@ua141d10.elisa.omakaista.fi
71c7035035
Added find_type_or_exit and find_bit_type_or_exit as wrappers
...
around the original functions. These will ensure that error
message is always in unique form, reduce code and print the
right alternatives automatically in an error case.
2007-03-19 11:19:51 +02:00
kent@mysql.com/kent-amd64.(none)
ab230132ca
CMakeLists.txt:
...
Removed references to my_winsem.c
2007-03-12 14:55:45 +01:00
kent@kent-amd64.(none)
7a0765c0af
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 14:53:52 +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@kent-amd64.(none)
9d396c6996
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-03-12 13:29:11 +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)
14504b12b8
Merge recycle.(none):/src/bug25222/my50-bug25222
...
into recycle.(none):/src/bug25222/my51-bug25222
2007-03-07 10:51:25 -05: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
tsmith@quadxeon.mysql.com
79191807ff
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg0306/51
2007-03-07 07:21:24 +01:00
kostja@bodhi.local
3d488d496d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2007-03-06 16:44:14 +03: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