Commit graph

36159 commits

Author SHA1 Message Date
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
konstantin/kostja@bodhi.local
377e0862ca Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
dlenev@jabberwock.site
77f640b1a3 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  jabberwock.site:/home/dlenev/mysql-5.1-bg18437
2006-07-07 14:11:35 +04:00
konstantin/kostja@bodhi.netgear
a1f7b448e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtime
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-07 13:51:47 +04:00
konstantin/kostja@bodhi.netgear
35b6ad7968 Another post-merge fix. 2006-07-07 13:49:43 +04: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
ingo/mydev@chilla.local
49587d4b37 Merge chilla.local:/home/mydev/mysql-5.1--main
into  chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-07 09:14:09 +02:00
konstantin@bodhi.netgear
343a5244dc After merge fixes. 2006-07-07 03:07:45 +04:00
patg@govinda.patg.net
9889ba0996 Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-merge1
into  govinda.patg.net:/home/patg/mysql-build/mysql-5.1-merge1
2006-07-06 16:07:24 -07:00
knielsen@ymer.(none)
b5f8c6ea96 Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951
into  ymer.(none):/usr/local/mysql/tmp-5.1
2006-07-07 00:18:03 +02:00
konstantin@bodhi.netgear
4e23f9756d Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-07 02:18:02 +04:00
tomas@poseidon.ndb.mysql.com
5e3861cb95 removed alter table partition error test since it cannot be made predictable... name will change of created file 2006-07-07 00:18:01 +02:00
knielsen@ymer.(none)
5ea51287d6 BUG#19951: Race conditions in test wait_timeout.
Fix random failures in test 'wait_timeout' that depend on exact timing.

1. Force a reconnect initially if necessary, as otherwise slow startup
might have caused a connection timeout before the test can even start.

2. Explicitly disconnect the first connection to remove confusion about
which connection aborts from timeout, causing test failure.
2006-07-06 23:49:09 +02:00
guilhem@gbichot3.local
6ba4d22ca2 Testcase for BUG#20633 "INSERT DELAYED RAND() or @user_var does not replicate
statement-based" (bugfix was committed today):
we verify that now it works in mixed mode. And a comment.
2006-07-06 22:03:35 +02:00
ingo@chilla.local
1a98b89334 Merge chilla.local:/home/mydev/mysql-5.1
into  chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-06 21:45:15 +02:00
tomas@poseidon.ndb.mysql.com
6a6bd5b182 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 21:30:55 +02:00
konstantin@bodhi.netgear
01bc761690 Merge bodhi.netgear:/opt/local/work/tmp_merge
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
2006-07-06 22:55:48 +04:00
konstantin@bodhi.netgear
f22a50a93b Merge bodhi.netgear:/opt/local/work/mysql-5.1-root
into  bodhi.netgear:/opt/local/work/mysql-5.1-runtime-merge
2006-07-06 22:26:47 +04:00
ingo@chilla.local
8ef4970650 After merge fix. 2006-07-06 20:12:33 +02:00
tomas@poseidon.ndb.mysql.com
8f613e9263 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 20:04:48 +02:00
tomas@poseidon.ndb.mysql.com
1db0b2c6a6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 19:02:38 +02:00
tomas@poseidon.ndb.mysql.com
4199719438 Bug #20820 auto inc table not handled correctly when restored from cluster backup 2006-07-06 18:50:44 +02:00
guilhem@gbichot3.local
a4768e115a Fix for BUG#20349 "mysql-test-run.pl needs to add --debug to
mysql_client_test like mysql-test-run". Nothing to document.
2006-07-06 18:01:32 +02:00
joerg@trift2.
dcf85ebec4 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into trift2.:/M51/bug20216-5.1
2006-07-06 17:58:31 +02:00
guilhem@gbichot3.local
3ce7e9fc0c Merge gbichot3.local:/home/mysql_src/mysql-5.1
into  gbichot3.local:/home/mysql_src/mysql-5.1-new-WL3146-handler
2006-07-06 17:56:26 +02:00
guilhem@gbichot3.local
a5f184d5c7 Fix for BUG#20649 "mixed replication mode does not work with INSERT DELAYED".
The bug was that if the server was running in mixed binlogging mode,
and an INSERT DELAYED used some needing-row-based components like UUID(),
the server didn't binlog this row-based but statement-based, which
thus failed to insert correct data on the slave.
This changeset implements that when a delayed_insert thread is created,
if the server's global binlog mode is "mixed", that thread will use row-based.
This also fixes BUG#20633 "INSERT DELAYED RAND() or @user_var does not
replicate statement-based": we don't fix it in statement-based mode (would
require bookeeping of rand seeds and user variables used by each row),
but at least it will now work in mixed mode (as row-based will be used).
We re-enable rpl_switch_stm_row_mixed.test (so BUG#18590
which was about re-enabling this test, will be closed) to test the fixes.
Between when it was disabled and now, some good changes to row-based
binlogging (no generation of table map events for non-changed tables)
induce changes in the test's result file.
2006-07-06 17:54:04 +02:00
guilhem@gbichot3.local
fd520be817 Behaviour change of mysql-test-run.pl:
by default we never run disabled tests (even if they're
explicitely listed on the command-line). We add an option --enable-disabled
which will run tests even though they are disabled, and will print, for each
such test, the comment explaining why it was disabled.
The reason for the change is when you want to run "all tests which are about
NDB" for example: mysql-test-run.pl t/*ndb*.test used to run some disabled
NDB tests, causing failures, causing investigations.
Code amended and approved by Kent.
2006-07-06 17:40:36 +02:00
ingo@chilla.local
3671658cbe Merge chilla.local:/home/mydev/mysql-5.0-bug16218
into  chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 16:09:50 +02:00
joerg@trift2.
26b7bc8eab Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1
into trift2.:/M51/merge-5.1
2006-07-06 15:52:39 +02:00
tomas@poseidon.ndb.mysql.com
a9348557b2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 15:52:38 +02:00
tomas@poseidon.ndb.mysql.com
deb1884cef corrected result file
- missing order by
2006-07-06 15:51:13 +02:00
ingo@chilla.local
44ed4b8ecb After merge fixes. 2006-07-06 15:38:47 +02:00
tomas@poseidon.ndb.mysql.com
bcd8fab178 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 15:23:23 +02:00
tomas@poseidon.ndb.mysql.com
9944e41f6e Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-07-06 15:20:22 +02:00
tomas@poseidon.ndb.mysql.com
ec8771af69 backport of ndb DictCache fix
- don't invalidate tables that are in state RETRIEVING
2006-07-06 15:18:00 +02:00
guilhem@gbichot3.local
3365337cef Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into  gbichot3.local:/home/mysql_src/mysql-5.0
2006-07-06 14:46:52 +02:00
guilhem@gbichot3.local
dd84ef1b8a Merge gbichot3.local:/home/mysql_src/mysql-5.0-20524
into  gbichot3.local:/home/mysql_src/mysql-5.0
2006-07-06 14:42:47 +02:00
guilhem@mysql.com
140b488c96 Fix for BUG#20524 "auto_increment_* not observed when inserting
a too large value": the bug was that if MySQL generated a value for an
auto_increment column, based on auto_increment_* variables, and this value
was bigger than the column's max possible value, then that max possible
value was inserted (after issuing a warning). But this didn't honour
auto_increment_* variables (and so could cause conflicts in a master-master
replication where one master is supposed to generated only even numbers,
and the other only odd numbers), so now we "round down" this max possible
value to honour auto_increment_* variables, before inserting it.
2006-07-06 14:37:09 +02:00
ingo@chilla.local
db0e7774aa Merge chilla.local:/home/mydev/mysql-5.0-ateam
into  chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 13:18:00 +02:00
jonas@perch.ndb.mysql.com
200deaa99e 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-07-06 12:11:14 +02:00
tomas@poseidon.ndb.mysql.com
4d0d6cff98 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 12:11:13 +02:00
dlenev@mysql.com
d6f47c31b6 After merge fixes for patch solving bug#18437 "Wrong values inserted with a
before update trigger on NDB table".

Two main changes:
- We use TABLE::read_set/write_set bitmaps for marking fields used by
  statement instead of Field::query_id in 5.1.
- Now when we mark columns used by statement we take into account columns 
  used by table's triggers instead of marking all columns as used if table
  has triggers.
2006-07-06 13:33:23 +04:00
tomas@poseidon.ndb.mysql.com
e2db01e3bc Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
2006-07-06 10:29:00 +02:00
tomas@poseidon.ndb.mysql.com
42d549a9dd corrected results 2006-07-06 10:20:49 +02:00
ingo@chilla.local
3a252caa86 Merge chilla.local:/home/mydev/mysql-5.1--main
into  chilla.local:/home/mydev/mysql-5.1-ateam
2006-07-06 10:10:12 +02:00