Commit graph

35204 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
697db8f043 Bug #20336 CLUSTERLOG commands have no effect
- always calculate max log level on node start
- send event subscribe uncond
2006-06-12 13:06:56 +02:00
mskold@mysql.com
be60898441 Merge mysql.com:/home/marty/MySQL/mysql-5.0
into  mysql.com:/home/marty/MySQL/mysql-5.1
2006-06-12 11:34:00 +02:00
mskold@mysql.com
d17c3d3c7c Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Skipped lock check for full table scan due to bug #20390 SELECT FOR UPDATE does not release locks of untouched rows in full table scans 2006-06-12 10:40:56 +02:00
mskold@mysql.com
58f686f985 Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Added missing parameter for readTuples in index scan 2006-06-12 10:22:32 +02:00
mskold@mysql.com
b93ba41e68 Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-12 09:42:20 +02:00
mskold@mysql.com
e7c1a57f3d Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: Adapted to 5.0 code changes 2006-06-12 09:37:19 +02:00
mskold@mysql.com
b89f17912c Added lock test on index scan 2006-06-12 09:28:27 +02:00
mskold@mysql.com
030f63fdab Moved back comment to correct method 2006-06-12 09:27:04 +02:00
igor@rurik.mysql.com
bb94b35f2f Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into  rurik.mysql.com:/home/igor/mysql-5.0-opt
2006-06-11 13:45:18 -07:00
ingo@mysql.com
76f066aa32 Merge mysql.com:/home/mydev/mysql-5.0
into  mysql.com:/home/mydev/mysql-5.0-amerge
2006-06-10 12:24:44 +02:00
ingo@chilla.local
a94ad6a2e3 Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-10 06:15:26 +02:00
igor@rurik.mysql.com
60620b31fe Post-merge fixes 2006-06-09 19:29:39 -07:00
igor@rurik.mysql.com
940fe6fea6 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.0-0
2006-06-09 17:56:08 -07:00
igor@rurik.mysql.com
bcc898f71b Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1
into  rurik.mysql.com:/home/igor/mysql-5.1
2006-06-09 15:39:10 -07:00
kent@mysql.com
3744b46a1d Merge bk-internal:/home/bk/mysql-4.1
into  mysql.com:/data0/mysqldev/my/mysql-4.1
2006-06-09 22:42:34 +02:00
konstantin@mysql.com
5579fc230d Disable im_life_cycle test 2006-06-10 00:35:44 +04:00
kent@mysql.com
a5bc38a0d3 Merge bk-internal:/home/bk/mysql-5.0
into  mysql.com:/data0/mysqldev/my/mysql-5.0
2006-06-09 22:34:21 +02:00
igor@rurik.mysql.com
3d6899948b Merge rurik.mysql.com:/home/igor/mysql-5.1
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 12:31:15 -07:00
igor@rurik.mysql.com
e6e4462d68 Post-merge fixes 2006-06-09 12:27:28 -07:00
sergefp@mysql.com
a0676542a7 Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/psergey/mysql-5.1-bug19684
2006-06-09 20:38:53 +04:00
ingo@chilla.local
091401e7a8 Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 18:20:10 +02:00
ingo@chilla.local
f991b573c5 Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 17:32:23 +02:00
holyfoot@mysql.com
c2df72d6cb Merge 2006-06-09 19:09:42 +05:00
joerg@trift2.mysql.com
44c0053a44 Merge trift2.mysql.com:/M41/bug20303-4.1
into trift2.mysql.com:/M41/mysql-4.1
2006-06-09 14:37:24 +02:00
joerg@trift2.mysql.com
4b9a1a8bbb Merge trift2.mysql.com:/M50/bug20303-5.0
into trift2.mysql.com:/M50/mysql-5.0
2006-06-09 14:13:01 +02:00
joerg@trift2.
7987ef89fd Merge mysql.com:/M51/bug20303-5.1 into mysql.com:/M51/mysql-5.1 2006-06-09 13:56:29 +02:00
ingo@mysql.com
0ae24af51b Merge mysql.com:/home/mydev/mysql-5.1--main
into  mysql.com:/home/mydev/mysql-5.1-amerge
2006-06-09 13:51:41 +02:00
joerg@mysql.com
98b80d12cd Merge mysql.com:/M50/bug20303-5.0 into mysql.com:/M51/bug20303-5.1 2006-06-09 13:49:10 +02:00
tomas@poseidon.ndb.mysql.com
6e68423db6 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-06-09 12:40:10 +02:00
tomas@poseidon.ndb.mysql.com
5af1d8de07 Bug #13266 Online adding of MySQLD causes cluster to crash
- check node type, if configuration has not bee updated, type will be undefined, and conenction will be refused
2006-06-09 12:30:04 +02:00
jonas@perch.ndb.mysql.com
246d76f154 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-06-09 12:17:00 +02:00
mskold@mysql.com
22fea185bd Merge mysql.com:/home/marty/MySQL/mysql-4.1
into  mysql.com:/home/marty/MySQL/mysql-5.0
2006-06-09 12:07:04 +02:00
jonas@mc01.ndb.mysql.com
4a8dbd3f7b Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-09 11:40:38 +02:00
jonas@mc01.ndb.mysql.com
9064f067e8 ndb - fix 5.1 scan error handling problem
Make sure that error gets set corretly also
    when error code directly after taking mutex
2006-06-09 11:39:27 +02:00
igor@rurik.mysql.com
9ec346b980 Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:48:51 -07:00
igor@rurik.mysql.com
70ee1c2c6e Merge rurik.mysql.com:/home/igor/tmp_merge
into  rurik.mysql.com:/home/igor/dev/mysql-5.1-0
2006-06-09 00:23:59 -07:00
jonas@perch.ndb.mysql.com
e3323e7b90 ndb -
restore --with-ndb-ccflags functionality
2006-06-09 09:06:43 +02:00
knielsen@mysql.com
6d40321bac Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00
jonas@perch.ndb.mysql.com
e576b2460b ndb - testframework
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
2006-06-09 08:22:50 +02:00
joerg@mysql.com
1cd78f7a2b Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0 2006-06-08 19:57:26 +02:00
joerg@mysql.com
a26c9c31a1 mysql-test/mysql-test-run.pl : Output the usage error if one is given. (Found when fixing bug#20303) 2006-06-08 19:55:22 +02:00
joerg@mysql.com
47f37f4d45 Merge mysql.com:/M41/bug20303-4.1 into mysql.com:/M50/bug20303-5.0 2006-06-08 19:32:25 +02:00
tomas@poseidon.ndb.mysql.com
b9d43d7400 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
2006-06-08 17:57:55 +02:00
tomas@poseidon.ndb.mysql.com
a6294a33cf Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-06-08 17:55:44 +02:00
knielsen@mysql.com
acf3a19382 Add trigger to protect against changesets from crashed tree 2006-06-08 17:37:43 +02:00
tomas@poseidon.ndb.mysql.com
fec7fd18f0 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-main
2006-06-08 17:28:01 +02:00
tomas@poseidon.ndb.mysql.com
50bb4b6cb0 Bug #20336 CLUSTERLOG commands have no effect 2006-06-08 17:26:56 +02:00
jonas@mc01.ndb.mysql.com
b7ce47b28e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-08 16:33:17 +02:00
mskold@mysql.com
597e1444aa Fix for Bug #18184 SELECT ... FOR UPDATE does not work..: implemented ha_ndblcuster::unlock_row() and explicitly lock all rows that are not being unlocked 2006-06-08 16:12:38 +02:00
jonas@mc01.ndb.mysql.com
20903f8e49 merge 2006-06-08 16:11:55 +02:00