ramil/ram@ramil.myoffice.izhnet.ru
7512856c31
Merge mysql.com:/home/ram/work/b30088/b30088.5.0
...
into mysql.com:/home/ram/work/b30088/b30088.5.1
2007-08-02 16:56:32 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
c62d7528c8
Fix for bug #30088 : Can't disable myisam-recover by a value of "".
...
- test result.
Problem: we don't proper handle "" value of the --myisam-recover option.
Fix: turn off myisam recovering if --myisam-recover="" is set.
2007-08-01 11:41:13 +05:00
dkatz@damien-katzs-computer.local
32fce0e17e
Merge damien-katzs-computer.local:/Users/dkatz/50_hpux
...
into damien-katzs-computer.local:/Users/dkatz/mysql51
2007-07-27 13:41:11 -04:00
gbichot@production.mysql.com
48dfd5c796
tmp_table_size is not about user-created temporary tables, only
...
internal ones (like those of GROUP BY): fixing the --help text.
2007-07-25 22:29:53 +02:00
ramil/ram@ramil.myoffice.izhnet.ru
ede22768a9
Merge mysql.com:/home/ram/work/b28808/b28808.5.0
...
into mysql.com:/home/ram/work/b28808/b28808.5.1
2007-07-09 10:20:45 +05:00
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru
fca06fbc68
Fix for bug #28808 : log_queries_not_using_indexes variable dynamic change is ignored
...
Problem: logging queries not using indexes we check a special flag which
is set only at the server startup and is not changing with a corresponding
server variable together.
Fix: check the variable value instead of the flag.
2007-07-05 15:34:12 +05:00
msvensson@pilot.(none)
7f22aaea96
Merge pilot.(none):/data/msvensson/mysql/bug29133/my51-bug29133
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-27 09:15:17 +02:00
msvensson@pilot.(none)
058877e05e
Bug #29133 mysqld does not exit during shutdown
...
- Fix faulty merge by adding back the 'pthread_kill' call that
wakes up the select thread
2007-06-26 14:18:53 +02:00
tsmith@maint1.mysql.com
28242f775c
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rpl
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-21 22:10:40 +02:00
msvensson@pilot.(none)
8e65f66378
Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
...
into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
2007-06-21 16:58:22 +02:00
tnurnberg@sin.intern.azundris.com
3c1be00069
Bug#24924: shared-memory-base-name that is too long causes buffer overflow
...
long shared-memory-base-names could overflow a static internal buffer
and thus crash mysqld and various clients. change both to dynamic
buffers, show everything but overflowing those buffers still works.
The test case for this would pretty much amount to
mysqld --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX --shared-memory=1 &
mysqladmin --no-defaults --shared-memory-base-name=HeyMrBaseNameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX shutdown
Unfortunately, we can't just use an .opt file for the
server. The .opt file is used at start-up, before any
include in the actual test can tell mysqltest to skip
this one on non-Windows. As a result, such a test would
break on unices.
Fixing mysql-test-run.pl to export full path for master
and slave would enable us to start a server from within
the test which is ugly and, what's more, doesn't work as
the server blocks (mysqltest offers no fire-and-forget
fork-and-exec), and mysqladmin never gets run.
Making the test rpl_windows_shm or some such so we can
is beyond ugly. As is introducing another file-name based
special case (run "win*.test" only when on Windows). As is
(yuck) coding half the test into mtr (as in, having it
hand out a customized environment conductive to the shm-
thing on Win only).
Situation is exacerbated by the fact that .sh is not
necessary run as expected on Win.
In short, it's just not worth it. No test-case until we
have a new-and-improved test framework.
2007-06-21 04:30:10 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 09:42:22 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 17:21:27 +02:00
istruewing@chilla.local
938fc3d66e
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-16 13:14:23 +02:00
istruewing@chilla.local
70600c15d8
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-16 11:34:21 +02:00
tomas@whalegate.ndb.mysql.com
8d31148899
Bug #28949
...
- handler binlog's must be shutdoem before logger.cleanup_base
2007-06-16 11:16:02 +02:00
iggy@alf.
e0adab8ce7
Merge alf.:D:/src/mysql-5.1-maint
...
into alf.:D:/src/mysql-5.1-maint_winemb
2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0
Embedded Server doesn't build on Windows.
...
- Add build configuration parameter EMBEDDED_ONLY which will configure
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
2007-06-15 14:32:16 -04:00
istruewing@chilla.local
875cac1ffb
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 20:23:20 +02:00
tsmith@maint1.mysql.com
a9ae34b56c
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:56:11 +02:00
tsmith@quadxeon.mysql.com
73035c274f
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 17:59:04 +02:00
istruewing@chilla.local
676ea58252
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-15 17:47:02 +02:00
cmiller@zippy.cornsilk.net
85caa3540e
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
2007-06-14 18:17:26 -04:00
cmiller@zippy.cornsilk.net
d37e579411
Bug#21723: Should be able to dump core after setuid() under Linux
...
In many cases, binaries can no longer dump core after calling setuid().
Where the PR_SET_DUMPABLE macro is set, use the prctl() system call
to tell the kernel that it's allowed to dump the core of the server.
2007-06-14 14:24:59 -04:00
holyfoot/hf@hfmain.(none)
1e9373fd60
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-06-14 16:42:43 +05:00
holyfoot/hf@hfmain.(none)
8ccc50b303
Merge bk@192.168.21.1:mysql-5.0
...
into mysql.com:/d2/hf/mrg/mysql-5.0-opt
2007-06-14 16:41:10 +05:00
gkodinov/kgeorge@magare.gmz
fbefe9d552
Merge bk-internal:/home/bk/mysql-5.0-opt
...
into magare.gmz:/home/kgeorge/mysql/work/merge-5.1-opt
2007-06-12 16:34:54 +03:00
lars/lthalmann@dl145k.mysql.com
c9d1b262e3
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-11 09:55:34 +02:00
gluh@mysql.com/eagle.(none)
068f1f7dbf
Bug#28149 overflow in some "SHOW STATUS"-variables
...
changed bytes_received, bytes_sent status variables to longlong
2007-06-09 17:46:09 +05:00
holyfoot/hf@mysql.com/hfmain.(none)
6ee83df5ff
bug #28309 First insert violates UNIQUE constraint - was "memory" table empty?
...
If we have lower_case_table_names == 2 (usually on case insensitive file
systems) we sometimes make 'homedir' part of the path sent to the
handler into lowercase. So in this case HEAP engine couldn't properly
find and remove HP_SHARE, what caused the bug.
2007-06-07 14:03:43 +05:00
acurtis/antony@ltamd64.xiphis.org
af72b54f3e
Merge xiphis.org:/home/antony/work2/mysql-5.0-engines
...
into xiphis.org:/home/antony/work2/mysql-5.0-engines.merge
2007-06-06 12:03:54 -07:00
acurtis/antony@ltamd64.xiphis.org
5a7f1f8a68
Merge xiphis.org:/home/antony/work2/mysql-5.1-engines
...
into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
2007-06-06 12:00:35 -07:00
tsmith@quadxeon.mysql.com
0ca0984f59
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
2007-06-05 23:06:43 +02:00
tsmith@quadxeon.mysql.com
d2fe24d1ef
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 23:04:40 +02:00
istruewing@chilla.local
a28abc0554
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-05 21:40:46 +02:00
istruewing@chilla.local
594c39bc6f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-05 19:56:57 +02:00
tsmith@quadxeon.mysql.com
4b93804592
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/51
2007-06-05 17:51:30 +02:00
tsmith@quadxeon.mysql.com
502320ef05
Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun05/50
2007-06-05 17:28:49 +02:00
lars/lthalmann@dl145h.mysql.com
98501127fb
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-05 01:15:07 +02:00
igor@olga.mysql.com
ca49b83d5a
Merge olga.mysql.com:/home/igor/mysql-5.1
...
into olga.mysql.com:/home/igor/mysql-5.1-opt-merge
2007-06-03 22:52:02 -07:00
mats@kindahl-laptop.dnsalias.net
2bcbb7dafc
BUG#28752 (binlog_format variable is empty when binlog is turned off):
...
Setting MIXED format instead of UNSPECIFIED format when server is
started without log-bin.
2007-06-02 21:01:30 +02:00
ibabaev@bk-internal.mysql.com
4bc1738be0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-opt
2007-06-02 00:57:25 +02:00
igor@olga.mysql.com
cf36fd1117
Merge olga.mysql.com:/home/igor/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.1-opt
2007-06-01 15:05:21 -07:00
kostja@bodhi.(none)
16633169e4
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.(none):/opt/local/work/mysql-5.1-runtime
2007-06-01 12:12:06 +04:00
istruewing@chilla.local
8e11f17504
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-05-31 21:34:05 +02:00
istruewing@chilla.local
937e400833
Merge chilla.local:/home/mydev/mysql-5.0-bug23068
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-05-31 20:08:23 +02:00
malff/marcsql@weblab.(none)
cb4316e35d
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-runtime
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
2007-05-29 10:52:07 -06:00
kaa@polly.local
cc5d3d2e5b
Merge polly.local:/home/kaa/src/maint/bug24611/my50-bug24611
...
into polly.local:/home/kaa/src/maint/mysql-5.0-maint
2007-05-29 17:16:23 +04:00
kaa@polly.local
76c21eaecd
Merge polly.local:/home/kaa/src/maint/bug24611/my50-bug24611
...
into polly.local:/home/kaa/src/maint/bug24611/my51-bug24611
2007-05-29 17:11:03 +04:00