svoj@mysql.com/april.(none)
db8a7b513c
Excluded wrongly merged changeset.
2007-02-07 01:37:21 +04:00
svoj@june.mysql.com
4a6770e06e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-02-05 15:31:20 +04:00
baker@bk-internal.mysql.com
a602d4a56e
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-02-05 00:31:36 +01:00
brian@zim.(none)
08be7c3314
Fixed bug#26027
...
Just a bad copy/paste of help info
2007-02-04 15:31:35 -08:00
istruewing@chilla.local
dde4f421f1
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:44:40 +01:00
istruewing@chilla.local
bdf18a85f9
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-03 09:43:38 +01:00
istruewing@chilla.local
b444566412
After merge fix
2007-02-03 09:26:11 +01:00
jani@a88-113-38-195.elisa-laajakaista.fi
cd75806b61
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1
2007-02-03 00:58:09 +02:00
istruewing@chilla.local
77e99fe2ce
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 23:05:46 +01:00
istruewing@chilla.local
41b6b32ef7
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-02 21:32:58 +01:00
istruewing@chilla.local
972df14cc6
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-02 20:23:03 +01:00
istruewing@chilla.local
177a366e53
After merge fix
2007-02-02 20:19:13 +01:00
istruewing@chilla.local
a6e4ada737
After merge fix
2007-02-02 17:47:13 +01:00
gluh@mysql.com/eagle.(none)
938de5eee4
another valgrind error fix for 4.1(backport from 5.0)
2007-02-02 17:18:42 +04:00
joerg@trift2.
ad7b10ca19
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into trift2.:/MySQL/M51/push-5.1
2007-02-02 13:57:19 +01:00
gluh@mysql.com/eagle.(none)
9663691aca
Merge mysql.com:/home/gluh/MySQL/Merge/5.0
...
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
2007-02-02 15:21:14 +04:00
gluh@mysql.com/eagle.(none)
31c3059ae9
Valgrind errors
...
added valgrind.supp to EXTRA_SCRIPTS(for pushbuild)
2007-02-02 15:01:11 +04:00
istruewing@chilla.local
80ca34c3a8
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-02 11:34:22 +01:00
gluh@mysql.com/eagle.(none)
29e1d5f9ce
after merge fix
2007-02-02 14:26:53 +04: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
gluh@eagle.(none)
7849d31923
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-02-02 10:25:45 +04:00
istruewing@chilla.local
ed09987083
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 19:41:04 +01:00
istruewing@chilla.local
5e5c1b761c
Merge chilla.local:/home/mydev/mysql-4.1-axmrg
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:33:54 +01:00
istruewing@chilla.local
dae855c168
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 17:10:09 +01:00
gluh@mysql.com/eagle.(none)
d1185aaeaf
Bug#23299 Some queries against INFORMATION_SCHEMA with subqueries fail
...
additional call of file->extra() method with HA_EXTRA_NO_CACHE parameter
2007-02-01 19:12:45 +04:00
istruewing@chilla.local
b0e8f2b534
Bug#25844: "make test" does not find mysql-test-run.pl
...
Need to change directory before calling mysql-test-run.pl
2007-02-01 15:59:51 +01:00
joerg@trift2.
9af6d01e3c
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-02-01 15:57:01 +01:00
istruewing@chilla.local
33e1d1091a
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 15:51:25 +01:00
istruewing@chilla.local
54bf789a6d
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-02-01 15:15:40 +01:00
gluh@mysql.com/eagle.(none)
010dc0b55c
Valgrind error fixes
...
Notes:
This patch doesn't fix all issues in the tree and we need jani's fix for that
This patch shoud not be merged into 5.0
2007-02-01 18:00:24 +04:00
gkodinov/kgeorge@rakia.gmz
d9ae9ce58d
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 13:26:25 +02:00
gkodinov/kgeorge@rakia.gmz
95154f86b5
trigger.result:
...
merge of the 5.0-opt tree
2007-02-01 13:25:50 +02: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
gkodinov/kgeorge@rakia.gmz
f697acb0ca
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.0-opt
2007-02-01 11:07:17 +02:00
gkodinov/kgeorge@rakia.gmz
1096dbd5fa
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B23556-5.1-opt
2007-02-01 10:59:14 +02:00
gkodinov/kgeorge@rakia.gmz
0d40608fff
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into rakia.gmz:/home/kgeorge/mysql/autopush/B25551-5.0-opt
2007-02-01 10:50:41 +02:00
istruewing@chilla.local
a3705af35f
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-engines
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-02-01 09:26:09 +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
istruewing@chilla.local
97cf413d55
Merge bk-internal.mysql.com:/home/bk/mysql-4.1-engines
...
into chilla.local:/home/mydev/mysql-4.1-axmrg
2007-02-01 07:52:28 +01:00
brian@zim.(none)
acd1201504
Reworked a section of code that caused valgrind errors (and that partitioning was not happy about).
2007-01-31 20:13:17 -08:00
igor@olga.mysql.com
710136217b
Fixed bug #25407 .
...
The bug could cause choosing a sub-optimal execution plan for
a single-table query if a unique index with many null keys were
defined for the table.
It happened because the code of the check_quick_keys function
made an assumption that any key may occur in an unique index
only once. Yet this is not true for keys with nulls that may
have multiple occurrences in the index.
2007-01-31 19:31:36 -08:00
df@kahlann.erinye.com
3f12c914b7
use MTR_BUILD_THREAD=auto for rpm builds
2007-01-31 19:01:46 +01:00
df@kahlann.erinye.com
1f9236d065
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.1-build-work
2007-01-31 18:58:00 +01:00
df@kahlann.erinye.com
9fe01abcca
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-31 18:54:15 +01:00
joerg@trift2.
852321c7f8
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-01-31 18:20:23 +01:00
df@kahlann.erinye.com
beb265b2fe
MTR_BUILD_THREAD=auto for test runs during RPM build
2007-01-31 18:18:44 +01:00
joerg@trift2.
f1289aa1d9
Merge trift2.:/MySQL/M50/bug23293-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-31 18:18:11 +01:00
joerg@trift2.
cd16ad87a2
Merge trift2.:/MySQL/M50/bug12676-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-31 18:16:51 +01:00
igor@olga.mysql.com
8760182170
Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
...
into olga.mysql.com:/home/igor/mysql-5.0-opt
2007-01-31 08:43:42 -08:00