tomas@whalegate.ndb.mysql.com
1e06586c90
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-30 16:31:08 +02:00
jonas@perch.ndb.mysql.com
15cfd0fd03
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-04-30 13:00:36 +02:00
jonas@perch.ndb.mysql.com
5db64df3dc
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-04-30 12:57:20 +02:00
jonas@perch.ndb.mysql.com
6559c77022
ndb - bug#28161
...
fix commit triggers with DD but not using DD
2007-04-30 12:56:16 +02:00
tomas@whalegate.ndb.mysql.com
598a60285f
ndb_restore to set correct value force varpart
...
+ some tests
2007-04-30 11:43:50 +02:00
jonas@perch.ndb.mysql.com
636a380efa
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-04-30 09:29:43 +02:00
jonas@perch.ndb.mysql.com
b5339a8059
ndb - force var part, part III
2007-04-30 09:02:52 +02:00
jonas@perch.ndb.mysql.com
7de7f8c1ff
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-30 07:11:56 +02:00
holyfoot/hf@mysql.com/hfmain.(none)
2fe860e84b
'no DBUG_RETURN' warning fixed
2007-04-30 01:06:16 +05:00
holyfoot/hf@hfmain.(none)
e0b6a9baa0
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-29 18:52:14 +05:00
holyfoot/hf@hfmain.(none)
2fcebef31f
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
...
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
2007-04-29 13:19:32 +05:00
tomas@whalegate.ndb.mysql.com
870c2a5b3f
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-27 21:01:23 +02:00
tomas@whalegate.ndb.mysql.com
d424f0d890
ndb: missing init and copy of m_force_var_part
2007-04-27 21:00:21 +02:00
tomas@whalegate.ndb.mysql.com
10be9bf531
Bug#24951, Data nodes died(lgman) during creating tables
...
- reverting wrong part in patch
2007-04-27 13:50:33 +02:00
tomas@whalegate.ndb.mysql.com
f53e1929a2
Bug#24560 Data nodes died(lgman) if undo_buffer_size from logfile group has small value
2007-04-27 12:26:13 +02:00
tomas@whalegate.ndb.mysql.com
cfd4183e5e
Bug#24951, Data nodes died(lgman) during creating tables
2007-04-27 12:23:40 +02:00
tomas@whalegate.ndb.mysql.com
9b41ce38ef
Bug #25741 Unable to allocate node id during restarting data node
...
- add additional sleep so that we don't get 100% cpu usage retrying saomething that can take some time before succeeding
2007-04-27 12:11:29 +02:00
tomas@whalegate.ndb.mysql.com
c1cdd288b9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-27 11:45:03 +02:00
tomas@whalegate.ndb.mysql.com
2061324ed1
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 22:51:38 +02:00
tomas@whalegate.ndb.mysql.com
9e9df36d8e
BUG#25741 AllocNodeIdRef::NodeFailureHandlingNotCompleted
2007-04-26 22:49:58 +02:00
svoj@april.(none)
640b3e4e74
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-04-27 01:33:16 +05:00
joerg@trift-lap.fambruehe
044f2e110e
Merge trift-lap.fambruehe:/MySQL/M50/push-5.0
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 17:11:33 +02:00
joerg@trift-lap.fambruehe
f723388b18
Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1
...
into trift-lap.fambruehe:/MySQL/M51/push-5.1
2007-04-26 16:03:02 +02:00
tomas@whalegate.ndb.mysql.com
9edb19eedf
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 13:56:32 +02:00
tomas@whalegate.ndb.mysql.com
99b81f15f5
remove compiler warning
2007-04-26 13:56:09 +02:00
tomas@whalegate.ndb.mysql.com
0326179d10
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-26 13:50:04 +02:00
tomas@whalegate.ndb.mysql.com
ef77deda42
Bug #27205 Occational 899 if delete+insert during LCP
...
- put page of deleted row last in list
2007-04-26 13:41:33 +02:00
tomas@whalegate.ndb.mysql.com
8dd90e8817
WL#1190 preparatory work needed for compatability with future online add column
2007-04-26 13:36:51 +02:00
tomas@whalegate.ndb.mysql.com
3b38c544eb
ndb: force varpart part I, allow setting of flag in dictionary
2007-04-26 08:34:38 +02:00
jonas@perch.ndb.mysql.com
35b65dbf14
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-04-25 23:49:37 +02:00
jonas@perch.ndb.mysql.com
0fc59172aa
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-04-25 23:48:31 +02:00
jonas@perch.ndb.mysql.com
7c7f5104eb
ndb -
...
clean up varsize
by putting varpart ref "inside" fixpart instead of "optionally" at the end
2007-04-25 22:50:35 +02:00
knielsen@ymer.(none)
5dff16eb80
Merge bk-internal:/home/bk/mysql-5.1-telco-gca
...
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 20:45:48 +02:00
jonas@perch.ndb.mysql.com
7b215a5762
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-25 18:02:40 +02:00
knielsen@ymer.(none)
0faa86bb86
After-merge fixes.
2007-04-25 15:48:12 +02:00
knielsen@ymer.(none)
39914c9b9b
Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-25 15:40:13 +02:00
knielsen@ymer.(none)
0027a93dc5
Merge ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca-bug28073
...
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 15:21:05 +02:00
knielsen@ymer.(none)
7a54b41925
Merge ymer.(none):/usr/local/mysql/mysql-5.0-telco-gca
...
into ymer.(none):/usr/local/mysql/mysql-5.1-telco-gca
2007-04-25 15:18:34 +02:00
knielsen@ymer.(none)
2c65524328
Merge bk-internal:/home/bk/mysql-5.1-new-ndb
...
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2007-04-25 15:06:03 +02:00
knielsen@ymer.(none)
45e18df811
After-merge fixes.
2007-04-25 15:02:23 +02:00
knielsen@ymer.(none)
e8c6b76615
BUG#28073: Infinite loop in lock queue.
...
In a certain code path the NDBD could loop infinitely in the lock queue.
2007-04-25 14:38:05 +02:00
stewart@willster.(none)
14cf73361a
Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2007-04-24 13:45:28 -07:00
stewart@willster.(none)
14ff88741c
Bug #24228 ndb_size.pl requires non-standard HTML::Template module
...
Bug #24227 ndb_size.pl should report default values instead of < default for config params
Bug #24229 ndb_size.pl doesn't compute Index usage correctly
Big ndb_size.pl update
2007-04-24 13:43:13 -07:00
df@pippilotta.erinye.com
6992b90152
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
2007-04-24 22:34:57 +02:00
tomas@whalegate.ndb.mysql.com
64d2bea65b
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-24 19:23:36 +02:00
jonas@perch.ndb.mysql.com
da8931cb98
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-04-24 09:53:32 +02:00
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
jonas@perch.ndb.mysql.com
542c9e9b5d
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-04-24 08:24:34 +02:00
jonas@perch.ndb.mysql.com
dfa2008911
ndb - bug#21755
...
table/index (es) need special treatment...
2007-04-24 08:22:30 +02:00
iggy@recycle.(none)
13b54aa963
Bug#24732 Executables do not include Vista manifests
...
- Post merge cleanup.
2007-04-23 16:23:32 -04:00