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
5c2138f57b
Bug #24667 After ALTER TABLE operation ndb_dd table becomes regular ndb
2007-04-26 13:12:43 +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)
f1898c0569
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:32:44 +02:00
tomas@whalegate.ndb.mysql.com
e5fb1acdf7
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-04-25 15:29:50 +02:00
tomas@whalegate.ndb.mysql.com
138264acab
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-25 15:28:56 +02:00
tomas@whalegate.ndb.mysql.com
7d63b2d12c
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-04-25 15:25:56 +02:00
tomas@whalegate.ndb.mysql.com
0183b3d399
ndb: added some retry sleep to not get busy loops
2007-04-25 15:25:23 +02:00
tomas@whalegate.ndb.mysql.com
c1d0bbbbe6
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-25 15:24:17 +02:00
tomas@whalegate.ndb.mysql.com
0ac443eff5
Bug #28093 ndb: retry sleep in get table stats 30s instead of 30ms
2007-04-25 15:21:38 +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
tomas@whalegate.ndb.mysql.com
be343dc78a
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-04-25 15:02:53 +02:00
knielsen@ymer.(none)
45e18df811
After-merge fixes.
2007-04-25 15:02:23 +02:00
tomas@whalegate.ndb.mysql.com
1e3938b9b1
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-25 15:01:53 +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
mjorgensen@blade09.mysql.com
d343965fcd
thread_registry.cc:
...
Disable assert causing bug # 28030 temporarily, since it's non-critical, and the bug have been filed
2007-04-25 12:08:12 +02:00
knielsen@ymer.(none)
32e7f9e62d
BUG#27495: Missing implementation of NdbTransaction::executeAsynch().
...
NdbTransaction::executeAsynch() was not implemented. Add implementation.
2007-04-25 09:23:28 +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
iggy@recycle.(none)
08ea692a7f
- Resolved conflict between fixes for bugs 25141 and 26074.
...
- Use the 25141 fix.
- 26074 is duplicate, as 25141 has more comprehensive test
2007-04-24 16:07:52 -04:00
iggy@recycle.(none)
0dfb49b0a6
- Removing mistake.
2007-04-24 14:26:49 -04:00
iggy@recycle.(none)
8e11fe899e
Cset exclude: iggy@alf.|ChangeSet|20070330021852|19466
2007-04-24 13:51:59 -04:00
tomas@whalegate.ndb.mysql.com
c6377e660c
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-04-24 19:24:13 +02:00
tomas@whalegate.ndb.mysql.com
6654cc8a99
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-04-24 19:24:07 +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
iggy@alf.
b2bf19354c
Merge alf.:D:/src/mysql-5.1-maint
...
into alf.:D:/src/mysql-5.1-maint_pt
2007-04-24 12:50:28 -04:00
iggy@alf.
0f43ac0d2a
Minor fixes.
2007-04-24 12:41:08 -04:00
mskold/marty@mysql.com/linux.site
f7098f76c7
Added missing backslash
2007-04-24 17:42:16 +02:00
mskold/marty@linux.site
cabef956c2
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-24 15:11:22 +02:00
mskold/marty@linux.site
fb6b0708b1
Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-04-24 14:29:35 +02:00
mskold/marty@mysql.com/linux.site
eaba3f2548
ha_ndbcluster.h, ha_ndbcluster.cc:
...
Refactored code for engine_condition_pushdown to ha_ndbcluster_cond
Makefile.am:
Added compilation of ha_ndbcluster_cond
ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc:
Merge
2007-04-24 14:24:06 +02:00
msvensson@pilot.blaudden
b841154e65
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 14:07:30 +02:00
msvensson@pilot.blaudden
9bd17ef189
Merge pilot.blaudden:/home/msvensson/mysql/bug25118/my50-bug25118
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 13:59:44 +02:00
msvensson@pilot.blaudden
8bbdc58bcd
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 13:08:01 +02:00
msvensson@pilot.blaudden
88ad41e256
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 13:06:58 +02:00
msvensson@pilot.blaudden
4563137549
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
2007-04-24 11:21:42 +02:00
msvensson@pilot.blaudden
ffd0d33fd2
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
2007-04-24 11:18:52 +02:00