Commit graph

2100 commits

Author SHA1 Message Date
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
jani@ua141d10.elisa.omakaista.fi
b4ba815967 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-10 16:28:47 +03: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
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
tsmith@quadxeon.mysql.com
a95aa68008 Portability fix to work around OS X -x86 toolchain bug with common (uninitialized data) symbols 2007-04-04 11:41:43 +02:00
tsmith@quadxeon.mysql.com
2117193783 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/mrg04/51
2007-04-04 11:05:22 +02: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
msvensson@pilot.blaudden
fc904eaead Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-02 11:15:09 +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
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
kaa@polly.local
68aa95446e Merge polly.local:/tmp/maint/bug26844/my51-bug26844
into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
2007-03-28 20:39:34 +04: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
kaa@polly.local
33358a5be6 Merge polly.local:/tmp/maint/bug26844/my50-bug26844
into  polly.local:/tmp/maint/bug26844/my51-bug26844
2007-03-28 20:10:41 +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
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
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
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
antony@ppcg5.local
d4d37f113e WL#2936
"Server variables for plugins"
  Post review fixes.
2007-03-23 10:14:46 -07: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
istruewing@chilla.local
942cd7d424 Bug#17332 - changing key_buffer_size on a running server
can crash under load
After review fixes
2007-03-23 11:52:45 +01: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
7dc48fd63b Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-03-23 11:26:50 +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