mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
36275 commits 2781 branches 343 tags 1.6 GiB
Commit graph

36275 commits

This branch
This branch
All branches
Author SHA1 Message Date
konstantin/kostja@bodhi.local
45b70962ba Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-with-5.0
 2006-07-07 20:51:48 +04:00
mats@romeo.(none)
4044fb8cc7 Bug#20850 (Assert during slave shutdown in many rpl_* tests): 
Previous patch didn't work: moving variable settings inside critical region.
 2006-07-07 18:31:00 +02:00
knielsen@devsrv-b.mysql.com
8f243bd96a Merge knielsen@knielsen.mysql.internal:/usr/local/mysql/tmp-5.1 
into  devsrv-b.mysql.com:/data0/knielsen/tmp-5.1
 2006-07-07 17:52:14 +02:00
tomas@poseidon.ndb.mysql.com
e64e6d3caf Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-ndb
 2006-07-07 17:52:13 +02:00
tomas@poseidon.ndb.mysql.com
5ab4800fc2 Bug #20897 race condition between drop table and suma drop trigger 
- keep accounting for aoutstanding drop trigger requests
- also lock table object in suma while doing that (should be impossible right now though since dict serializes all requests)
 2006-07-07 17:50:45 +02:00
knielsen@ymer.(none)
438d8cea7a BUG#20902: Test failure in ndb_alter_table3 with statement-based binlogging 
Disable test cases ndb_alter_table3, ndb_autodiscover3, ndb_dd_advance,
and ndb_multi in statement-based binlogging mode until bug can be fixed.
 2006-07-07 17:20:49 +02:00
cmiller@zippy.(none)
a3b2340357 Merge cleanup, with a change of verbose test status to Off. 2006-07-07 10:47:51 -04:00
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
pekka@mysql.com/orca.ndb.mysql.com
c9bc03c3cd Merge mysql.com:/space_old/pekka/ndb/version/my41-bug20847 
into  mysql.com:/space_old/pekka/ndb/version/my50-bug20847
 2006-07-07 13:40:47 +02: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
pekka@mysql.com
7ed021f926 ndb - bug#20847 : DbtupTabDesMan: add merge with left buddies 2006-07-07 10:57:22 +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
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)
31ddb04105 Merge ymer.(none):/usr/local/mysql/mysql-5.0-bug19951 
into  ymer.(none):/usr/local/mysql/tmp-5.0
 2006-07-06 23:52:05 +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
b900484346 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-amerge
 2006-07-06 21:59:48 +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
73064141f6 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 20:09:25 +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
ingo@chilla.local
f031de4f9e Merge chilla.local:/home/mydev/mysql-5.0-bug16218 
into  chilla.local:/home/mydev/mysql-5.0-ateam
 2006-07-06 19:38:10 +02:00
ingo@chilla.local
591d461d95 Merge chilla.local:/home/mydev/mysql-5.0 
into  chilla.local:/home/mydev/mysql-5.0-bug16218
 2006-07-06 19:36:07 +02:00
tomas@poseidon.ndb.mysql.com
8816f98036 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 19:03:33 +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.
a873811ae8 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into trift2.:/M50/merge-5.0
 2006-07-06 16:03:02 +02:00
tomas@poseidon.ndb.mysql.com
27a8cade86 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
 2006-07-06 16:03:01 +02:00