mats@romeo.(none)
a3978ceb33
Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
...
into romeo.(none):/home/bk/b20821-mysql-5.1-new-rpl
2006-07-07 16:15:53 +02:00
mats@romeo.(none)
fe4a22f36b
Correcting signature for my_strndup to be able to build on Windows
...
in pushbuild on Replication/Backup team tree.
2006-07-07 15:59:17 +02:00
mats@romeo.(none)
083347db23
Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into romeo.(none):/home/bkroot/mysql-5.1-new-rpl
2006-07-07 15:25:19 +02:00
grog@eucla.lemis.com
723faeabce
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
...
into eucla.lemis.com:/home/MySQL/5.1-Bug-20850
2006-07-07 17:43:52 +09:30
grog@eucla.lemis.com
8710951295
slave.cc:
...
BUG#20850: Assert during slave shutdown in many rpl_* tests.
This was caused by a race condition at the end of handle_slave_io
which under some circumstances allowed the cleanup to proceed before
the thread had completed.
2006-07-07 17:18:52 +09:30
grog@eucla.lemis.com
1afe620116
slave.cc:
...
Tidy up white space.
2006-07-07 16:57:55 +09:30
mats@romeo.(none)
f7d0091dfa
Adding sleep to allow mysqlslap to finish it's job on systems under high load.
2006-07-07 09:25:12 +02:00
mats@mysql.com
8f5689fd4f
Switching to use INSERT DELAYED, which it should be, for rpl_insert.
2006-07-05 21:17:00 +02:00
mats@romeo.(none)
a3ae339829
Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/home/bk/b20821-mysql-5.1-new-rpl
2006-07-05 17:11:36 +02:00
mats@mysql.com
fd92d8072a
BUG#20821 (INSERT DELAYED fails to write some rows to binlog):
...
Reverting to old behaviour of writing the query before all rows
have been written.
2006-07-05 16:58:56 +02:00
lars@dl145j.mysql.com
aed40706ff
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-07-03 13:10:46 +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
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
lars@mysql.com
78a9adb659
Changed the number of test iterations since this makes test time
...
go from 623 seconds to 11 seconds on AMD64.
This is because we have no native atomic implementation on AMD64,
so the rwlock-based implementation is used, which is a bit slow.
It will be probably be optimized for AMD64 quite soon, but for now
this test case will do fewer iterations.
2006-06-30 11:31:43 +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
petr@mysql.com
4d76c28caa
Fix Bug#20692 rpl_* tests failure on hpux
2006-06-29 21:43:52 +04:00
tomas@poseidon.ndb.mysql.com
42dfb7a88d
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-29 17:26:22 +02:00
stewart@willster.(none)
c3010c2497
Merge mysql.com:/home/stewart/Documents/MySQL/5.1/bug17928
...
into mysql.com:/home/stewart/Documents/MySQL/5.1/ndb
2006-06-29 22:36:27 +10:00
lars@dl145k.mysql.com
f3d8d60259
Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1
...
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
2006-06-29 14:24:02 +02:00
tomas@poseidon.ndb.mysql.com
019532a544
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 13:26:39 +02:00
tomas@poseidon.ndb.mysql.com
0822e24679
fixed too small requestInfo in signal
...
+ adopted signal to be as close as possible to 5.1...
2006-06-29 13:01:54 +02:00
tomas@poseidon.ndb.mysql.com
0d22cc662b
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 10:48:31 +02:00
gkodinov@mysql.com
3447374939
Merge mysql.com:/home/kgeorge/mysql/4.1/warnings
...
into mysql.com:/home/kgeorge/mysql/5.0/warnings
2006-06-29 10:46:30 +03:00
gkodinov@mysql.com
9dbb09182b
Merge mysql.com:/home/kgeorge/mysql/4.1/teamclean
...
into mysql.com:/home/kgeorge/mysql/4.1/warnings
2006-06-29 10:36:08 +03:00
monty@mysql.com
3f22bc07c6
Fixed failing test rpl_ndb_auto_inc.test
...
Mark events_stress.test as 'big' as it's very slow on some machines
2006-06-29 03:24:33 +03:00
monty@narttu.mysql.fi
7b0f8635ae
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-29 00:09:53 +03:00
evgen@moonbone.local
3ad6ad75e1
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into moonbone.local:/home/evgen/mysql-5.1-new
2006-06-28 21:51:19 +04:00
monty@narttu.mysql.fi
91c3e28d77
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/my/mysql-5.1
2006-06-28 20:03:46 +03:00
acurtis@ltamd64.xiphis.org
9d99e180f5
Merge xiphis.org:/home/antony/work2/p4-bug12096.3
...
into xiphis.org:/home/antony/work2/p4-bug12096.3-merge
2006-06-28 10:02:47 -07:00