knielsen@ymer.(none)
ae8f9ac9f3
Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-24 09:00:13 +02:00
knielsen@ymer.(none)
56cf7a53b6
BUG#27370: Potential inconsistent blob reads for ReadCommitted reads.
...
The old blob implementation had code that attempted to upgrade the lock mode for
LM_CommittedRead operations, but it did not work properly as it did not recompute
the operation flags.
As a consequence, reading a blob with LM_CommittedRead could return inconsistent
data, with different part of the read data being from different commits done by
other transactions.
The fix is to correctly recompute all necessary flags when upgrading lock mode.
2007-04-24 08:15:31 +02:00
jonas@perch.ndb.mysql.com
99e24e1e77
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
2007-03-28 09:58:04 +02:00
tomas@whalegate.ndb.mysql.com
c86293e41e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-27 18:12:33 +02:00
jonas@perch.ndb.mysql.com
c1946a59b9
ndb -
...
remove compiler warning/error
2007-03-27 16:47:08 +02:00
jonas@perch.ndb.mysql.com
050dcdee40
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-27 16:16:02 +02:00
jonas@perch.ndb.mysql.com
52469dee16
ndb -
...
reformat code a bit to be more compiler friendly
2007-03-27 16:15:22 +02:00
jonas@perch.ndb.mysql.com
924036859f
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-27 16:00:15 +02:00
jonas@perch.ndb.mysql.com
3aa1a59a77
ndb -
...
remove compiler warning from last changeset
2007-03-27 15:57:36 +02:00
jonas@perch.ndb.mysql.com
d50539b624
Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-03-27 14:33:18 +02:00
jonas@perch.ndb.mysql.com
e5faf16bc0
ndb - bug#27466 nf during nr can leave cluster in inconsistent state (recommit in 5.1)
...
Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop
Also retry on ZNODE_START_DISALLOWED_ERROR
2007-03-27 14:27:43 +02:00
joerg@trift-lap.fambruehe
336f03d151
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-03-27 12:06:13 +02:00
tomas@whalegate.ndb.mysql.com
99238e5593
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 21:14:28 +02:00
tomas@whalegate.ndb.mysql.com
1bae3e5726
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 21:13:46 +02:00
tomas@whalegate.ndb.mysql.com
71ec671d4d
correction of manual merge
2007-03-26 21:10:34 +02:00
tomas@whalegate.ndb.mysql.com
2923b52e38
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 21:02:14 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-26 20:57:10 +02:00
tomas@whalegate.ndb.mysql.com
c445baeabd
correct medium int printout
...
correct cit printout
correct bit store retrieve
2007-03-26 17:57:00 +02:00
tomas@whalegate.ndb.mysql.com
22c5d8ba44
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-26 14:49:24 +02:00
tomas@whalegate.ndb.mysql.com
405fb2cfb6
Bug #26986 BIT(33) for ndb is broken on solaris.
...
- always store lsw first in ndb
2007-03-26 14:48:52 +02:00
pekka@clam.ndb.mysql.com/clam.(none)
6ec8bb230a
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028
2007-03-26 12:50:40 +02:00
tomas@whalegate.ndb.mysql.com
7386c736c2
remove warning
2007-03-26 10:39:11 +02:00
tomas@whalegate.ndb.mysql.com
3d076ca0e5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:11:57 +02:00
tomas@whalegate.ndb.mysql.com
128b118bf0
Merge mysqldev@production.mysql.com:my/mysql-5.1-release
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:11:15 +02:00
tomas@whalegate.ndb.mysql.com
690b16be05
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-26 10:01:43 +02:00
tomas@whalegate.ndb.mysql.com
01189d9627
Bug #26900 ndb_restore printout option does not give structured data
...
- set sizes for data
2007-03-26 09:58:01 +02:00
tomas@whalegate.ndb.mysql.com
4d228c2f8f
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-03-25 16:44:44 +02:00
tomas@whalegate.ndb.mysql.com
cc47508432
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-25 16:44:06 +02:00
pekka@clam.(none)
5f061a7e5c
Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb
...
into clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
2007-03-25 15:06:19 +02:00
tomas@whalegate.ndb.mysql.com
d5f63f25c5
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 21:50:57 +01:00
tomas@whalegate.ndb.mysql.com
ac0da397db
rpl_ndb_sync.result, ndb_partition_key.result:
...
test case
2007-03-23 21:49:49 +01:00
joerg@trift2.
751531fca7
mysql-test/t/query_cache_sql_prepare.test : Prevent this test from running in "embedded".
2007-03-23 17:31:10 +01:00
tomas@whalegate.ndb.mysql.com
972837350b
result file updates, message format changes
2007-03-23 17:22:52 +01:00
tomas@whalegate.ndb.mysql.com
78dce2dd97
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
41dfbb6f2b
enabled and extended single user test
2007-03-23 17:14:38 +01:00
tomas@whalegate.ndb.mysql.com
df278bd605
BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table
2007-03-23 17:12:06 +01:00
tomas@whalegate.ndb.mysql.com
aadd161d65
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 17:09:10 +01:00
tomas@whalegate.ndb.mysql.com
9af7e2c5a4
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
2007-03-23 17:08:33 +01:00
tomas@whalegate.ndb.mysql.com
a837d95d53
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
2007-03-23 17:07:33 +01:00
tomas@whalegate.ndb.mysql.com
f4fed734c6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-03-23 14:17:08 +01:00
tomas@whalegate.ndb.mysql.com
8823a1a29f
correction of merge
2007-03-23 14:16:31 +01:00
tomas@whalegate.ndb.mysql.com
6c4a7a4469
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user
2007-03-23 14:09:30 +01:00
tomas@whalegate.ndb.mysql.com
9899df36bd
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
2007-03-23 14:06:00 +01:00
tomas@whalegate.ndb.mysql.com
29ac950b6f
Bug #25275 SINGLE USER MODE prevents ALTER on non-ndb tables for other mysqld nodes
2007-03-23 13:52:03 +01:00
tomas@poseidon.mysql.com
210d055000
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
2007-03-23 13:10:58 +01:00
holyfoot/hf@hfmain.(none)
5e0596f4e1
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/home/hf/work/mrg/mysql-5.1-opt
2007-03-23 15:51:21 +04:00
joerg@trift2.
d6880edd86
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-03-23 11:31:14 +01:00
joerg@trift2.
a1ffb00288
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:13:15 +01:00
joerg@trift2.
4ab912c92a
Merge trift2.:/MySQL/M50/mysql-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-03-23 11:10:27 +01:00
joerg@trift2.
dbad0e1c23
Merge trift2.:/MySQL/M50/clone-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-03-23 11:05:11 +01:00