knielsen@rt.int.sifira.dk
|
b1c686ccca
|
Merge rt.int.sifira.dk:/usr/local/mysql/mysql-5.1-pristine
into rt.int.sifira.dk:/usr/local/mysql/tmp-5.1
|
2006-07-04 22:42:29 +02:00 |
|
knielsen@rt.int.sifira.dk
|
5ebc51cc70
|
Fix hardcoded /tmp path (which causes problems when running multiple
tests on a single machine) to use $MYSQLTEST_VARDIR/tmp instead.
|
2006-07-04 22:37:32 +02:00 |
|
ingo@chilla.local
|
8d014f1f54
|
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/mydev/mysql-5.1-amerge
|
2006-07-04 15:25:52 +02:00 |
|
mskold@linux.site
|
9509145a9d
|
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/marty/MySQL/mysql-5.1-extra
|
2006-07-04 12:57:24 +02:00 |
|
ingo@chilla.local
|
cda8bce6c5
|
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/mydev/mysql-5.1-amerge
|
2006-07-04 12:57:24 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
59958be558
|
disabled ndb_autodiscover3
|
2006-07-04 12:57:23 +02:00 |
|
ingo@mysql.com
|
b2f58e94b1
|
After merge fix
|
2006-07-04 12:34:23 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
412082ebdd
|
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-07-04 11:56:44 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
98874725e0
|
Bug #20784 Uninitialized memory in update on table with PK not on first column
- partial backport of code from 5.1, do cot compare_record for engines that do not read all columns during update
|
2006-07-04 11:43:06 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
8a2694e25f
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-07-04 11:21:19 +02:00 |
|
ingo@mysql.com
|
d8546d07f8
|
Merge mysql.com:/home/mydev/mysql-5.0-tmp_merge
into mysql.com:/home/mydev/mysql-5.1-amerge
|
2006-07-04 10:02:11 +02:00 |
|
mskold@linux.site
|
f5fb7ef27a
|
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/marty/MySQL/mysql-5.1-extra
|
2006-07-04 09:17:32 +02:00 |
|
cmiller@zippy.(none)
|
267aeffca3
|
Renumber events to make tests pass. This must be a result of removing extraneous
COMMITs -- the numbers collapse to fill the gaps.
|
2006-07-03 23:17:53 -04:00 |
|
cmiller@zippy.(none)
|
5db7673f88
|
Removed extraneous COMMITs, from Bug#16206.
|
2006-07-03 19:03:47 -04:00 |
|
cmiller@zippy.(none)
|
8caedc5efd
|
Removed bdb test where the binlog format is indeterminate and updated a test
where it isn't. Removed a test where the merge was incorrect (and a test
duplicated.)
|
2006-07-03 18:29:01 -04:00 |
|
cmiller@zippy.(none)
|
90aa83d5e0
|
Additional patch from Bug#16206. BEGIN/COMMIT behavior changed 5.0 -> 5.1 .
|
2006-07-03 13:49:25 -04:00 |
|
cmiller@zippy.(none)
|
6110a83a0e
|
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.1
|
2006-07-03 11:35:58 -04:00 |
|
mskold@mysql.com
|
59d69f6d38
|
Fix for Bug #18413 Data usage for varsize columns are not correctly reported to mysqld
|
2006-07-03 17:09:32 +02:00 |
|
pekka@clam.ndb.mysql.com
|
ea794df45a
|
ndb - bug#20751 : report also composite op in merge
|
2006-07-03 12:13:57 +02:00 |
|
mikael@dator5.(none)
|
d5bb513021
|
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1
into dator5.(none):/home/pappa/bug17138
|
2006-07-01 19:47:24 -04:00 |
|
mikael@dator5.(none)
|
55109a802d
|
Merge dator5.(none):/home/pappa/bug20583
into dator5.(none):/home/pappa/bug17138
|
2006-07-01 00:28:04 -04:00 |
|
mikael@dator5.(none)
|
9e56572e5c
|
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug20583
|
2006-07-01 00:22:25 -04:00 |
|
mikael@dator5.(none)
|
5853823bb2
|
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug17138
|
2006-07-01 00:19:23 -04:00 |
|
mikael@dator5.(none)
|
4e390d711a
|
BUG#17138: Crashes in stored procedure
Last round of review fixes
|
2006-07-01 00:01:37 -04:00 |
|
evgen@moonbone.local
|
a3deb94518
|
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
into moonbone.local:/work/merge-5.1
|
2006-07-01 05:59:26 +04:00 |
|
evgen@moonbone.local
|
1459784aba
|
Reverted wrong bug fix (Bug#11228)
|
2006-07-01 01:37:20 +04:00 |
|
knielsen@devsrv-b.mysql.com
|
79ebe92208
|
Merge bk-internal:/home/bk/mysql-5.1
into mysql.com:/data0/knielsen/tmp-5.1
|
2006-06-30 18:20:45 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
c8b65bb357
|
manual merge, patch only relevant for 4.1
|
2006-06-30 16:29:17 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
9f542ef0f4
|
adopted ndb handler code for tables without primary key and with unique index
- added missing retrieval of hidden primary key
|
2006-06-30 16:25:07 +02:00 |
|
knielsen@rt.int.sifira.dk
|
dcd9132fe7
|
Merge mysql.com:/usr/local/mysql/mysql-5.1-bindist
into mysql.com:/usr/local/mysql/tmp-5.1
|
2006-06-30 15:21:45 +02:00 |
|
knielsen@mysql.com
|
5b1c92244c
|
Add a script scripts/make_win_bin_dist, used to generate a Windows
binary disctribution for Falcon.
|
2006-06-30 15:15:20 +02:00 |
|
evgen@moonbone.local
|
a989f7261e
|
Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-opt
into moonbone.local:/work/merge-5.1
|
2006-06-30 16:10:26 +04:00 |
|
evgen@moonbone.local
|
adbd5fb185
|
Manual merge
|
2006-06-30 16:09:14 +04:00 |
|
jonas@perch.ndb.mysql.com
|
05f14b144b
|
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-06-30 11:26:47 +02:00 |
|
jonas@perch.ndb.mysql.com
|
2711af699c
|
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
|
2006-06-30 11:19:55 +02:00 |
|
jonas@perch.ndb.mysql.com
|
8e11f6f508
|
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into perch.ndb.mysql.com:/home/jonas/src/51-work
|
2006-06-30 10:31:43 +02:00 |
|
jonas@perch.ndb.mysql.com
|
a4bfd31865
|
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into perch.ndb.mysql.com:/home/jonas/src/50-work
|
2006-06-30 09:42:15 +02:00 |
|
jonas@perch.ndb.mysql.com
|
ab3992771b
|
ndb - bug#20774
crash if system restart with more than 4096 fragments
solution: continueb enable expand check loop
|
2006-06-30 09:41:41 +02:00 |
|
petr@owlet.
|
b655968123
|
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/cps/mysql/trees/5.1-team
|
2006-06-30 11:17:53 +04:00 |
|
petr@mysql.com
|
c95ad6158a
|
cleanup
|
2006-06-30 08:11:51 +04:00 |
|
petr@mysql.com
|
157cc569a8
|
fix test failures
|
2006-06-30 03:28:58 +04:00 |
|
monty@hasky.mysql.fi
|
0b00ae6bc5
|
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
|
2006-06-29 23:41:33 +03:00 |
|
monty@mysql.com
|
8eb9c06d70
|
Replaced assert with argument checking, as rpl_ndb_UUID caused slave to fail on x86 64 bit
(It failed even if test was marked as skipped)
|
2006-06-29 23:22:55 +03:00 |
|
tomas@poseidon.ndb.mysql.com
|
3b3dde6f4e
|
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 22:13:19 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
5d67b05203
|
corrected merge error
|
2006-06-29 22:11:29 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
9d902d4cf8
|
manual merge
|
2006-06-29 21:25:37 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
6fb6a1058c
|
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
|
2006-06-29 21:14:29 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
6f318d1658
|
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
|
2006-06-29 21:05:43 +02:00 |
|
tomas@poseidon.ndb.mysql.com
|
87460ec76a
|
Bug #19202 Incorrect errorhandling in select count(*) wrt temporary error
|
2006-06-29 20:55:21 +02:00 |
|
petr@owlet.
|
35b7eb7e22
|
Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into mysql.com:/home/cps/mysql/trees/5.1-team
|
2006-06-29 21:48:53 +04:00 |
|