joreland@mysql.com
45a07db5c0
BUG#9749 - ndb lock upgrade - more fixes...
...
1) Make getNoParall into function instead of a procedure
2) Check for multiple transactions in "upgrade's" parallell queue
3) Set lock mode according to lock_owner's lockMode
NOTE: Does still not handle lock upgrade in case of aborts correctly
2005-04-13 09:54:40 +02:00
joreland@mysql.com
210a1fe5cc
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-13 07:43:03 +02:00
joreland@mysql.com
39e750d949
bug#9749 - ndb lock upgrade
...
handle more cases...
2005-04-12 17:54:34 +02:00
joreland@mysql.com
2e1e670b57
bug#9757 - ndb - post review
...
use DBUG_RETURN
2005-04-12 13:56:24 +02:00
joreland@mysql.com
8f0f041e64
bug#9757 - ndb
...
Impl. stupid mgm lock against shutting down 2 nodes simultaniously
Add some more dump
2005-04-12 13:36:43 +02:00
joreland@mysql.com
bd1c0ee2c0
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-11 14:31:14 +02:00
joreland@mysql.com
bb8dd31b63
ndb - replication bug fix
...
Fix gci reply on TC_COMMITREQ
(prefered way of mysqld)
2005-04-11 14:29:30 +02:00
pekka@mysql.com
fd5b9f7ed7
ndb - csc#4847 - manual merge 4.1->5.0
2005-04-11 12:43:58 +02:00
joreland@mysql.com
588559e3d8
Merge mysql.com:/home/jonas/src/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-11 10:26:18 +02:00
joreland@mysql.com
ed95158337
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-11 10:22:30 +02:00
pekka@mysql.com
ad92514d66
ndb - wl-2451: Increase max schema object to > 1600
2005-04-10 22:43:17 +02:00
pekka@mysql.com
dbae73bfa8
ndb - testOIBasic.cpp: 4.1->5.0 fix
2005-04-10 07:55:30 +02:00
joreland@mysql.com
d8a5305d0d
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-08 14:16:57 +02:00
joreland@mysql.com
72d89cc253
bug#9749 - ndb
...
test case for case 9749, ndb lock upgrade via NDBAPI
2005-04-08 14:15:37 +02:00
mskold@mysql.com
e66eaaa2a0
Merge
2005-04-07 18:37:04 +02:00
mskold@mysql.com
89b140340c
Fix for Bug #9675 Auto-increment not working with INSERT..SELECT and NDB storage
2005-04-07 17:44:09 +02:00
mskold@mysql.com
934f458140
Added missing DBUG_RETURNs
2005-04-07 12:12:03 +02:00
pekka@mysql.com
4c1e923846
ndb - DbtupScan.cpp added
2005-04-07 11:28:43 +02:00
pekka@mysql.com
4b75cf3d32
ndb - wl-2455 TUP scan for testing in 5.0
2005-04-07 11:15:34 +02:00
serg@serg.mylan
5cd866610d
after merge fix
2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea
manually merged
...
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
bar@mysql.com
0134a2b286
Adding a new parameter for well_formed_length to
...
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
pekka@mysql.com
114b421c8b
ndb - csc#4847 release scan op early to save memory
2005-04-05 13:14:03 +02:00
pekka@mysql.com
7a29a92ac4
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/export/space/pekka/ndb/version/my50-ndb
2005-04-05 10:01:12 +02:00
pekka@mysql.com
328b453c86
merge
2005-04-01 11:21:55 +02:00
pekka@mysql.com
5b9bd8c0c8
Merge
2005-04-01 10:13:37 +02:00
mskold@mysql.com
b5e57be56b
Fixed so no merge conflict with 5.0
2005-03-31 19:18:50 +02:00
pekka@mysql.com
af63ce9d22
ndb - fix small memory leak
2005-03-31 16:22:46 +02:00
mskold@mysql.com
75a4dc9644
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-31 14:33:51 +02:00
mskold@mysql.com
9795e7eda9
Removed warnings
2005-03-31 14:31:06 +02:00
pekka@mysql.com
10a03ce6c8
ndb - CSC#4927: ordered index + long pk, second half
2005-03-30 22:17:11 +02:00
joreland@mysql.com
738b9f9b8c
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-29 12:04:57 +02:00
joreland@mysql.com
9642b95c6c
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-29 12:02:28 +02:00
joreland@mysql.com
f83a426cf2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-29 12:00:43 +02:00
monty@mysql.com
c4467b817d
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
monty@mysql.com
dd4b0710dd
Cleanups during review
2005-03-29 12:37:36 +03:00
pekka@mysql.com
a259bcebd7
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/space/pekka/ndb/version/my41
2005-03-28 22:56:40 +02:00
pekka@mysql.com
5dea61b879
ndb - set up long key page vars in ACC_LOCKREQ (bug#????)
2005-03-28 22:55:32 +02:00
pekka@mysql.com
2a428a1af9
Merge mysql.com:/export/space/pekka/ndb/version/my41
...
into mysql.com:/export/space/pekka/ndb/version/my50
2005-03-28 11:52:16 +02:00
pekka@mysql.com
42a641ffde
ndb - make printSchemaFile available (compile manually)
2005-03-28 11:51:31 +02:00
jimw@mysql.com
dee535be63
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 10:51:08 -08:00
jimw@mysql.com
4f19826d80
Merge mysql.com:/home/jimw/my/mysql-4.1-9323
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:58 -08:00
joreland@mysql.com
7fbe97d36e
ndb - super pool - compile fix
...
remove extra qualification which picky gcc complains about
2005-03-23 09:09:13 +01:00
joreland@mysql.com
394b62966f
Merge mysql.com:/home/jonas/src/mysql-5.0
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-23 08:18:53 +01:00
joreland@mysql.com
ad9bfaeba9
merge
2005-03-23 08:12:52 +01:00
joreland@mysql.com
b2c9ab4bb2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-23 08:08:05 +01:00
joreland@mysql.com
e20ff10bd2
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-23 07:58:25 +01:00
jimw@mysql.com
0842efeab2
Fix calls to memset() with arguments out of order. (Bug #9323 )
2005-03-22 16:00:02 -08:00
mskold@mysql.com
68e5cf494e
Merged
2005-03-22 22:31:51 +01:00
mskold@mysql.com
9347abfe8d
Simplified rounding up to nearest 64-bit boundry
2005-03-22 22:12:24 +01:00