Commit graph

2165 commits

Author SHA1 Message Date
joreland@mysql.com
bbd0aa6cc3 bug#9969 - ndb
missleading error message
2005-04-22 09:40:44 +02:00
joreland@mysql.com
2ce7824e3f merge 2005-04-22 09:30:23 +02:00
joreland@mysql.com
e6142c477c bug#9924 - ndb backup abort handling
Redo abort handling according to descr. in Backup.txt
bug#9960 - ndb backup
      increase wait completed timeout to 48 hours
2005-04-22 09:07:25 +02:00
mskold@mysql.com
b1c8e44ead Merge 2005-04-21 10:26:14 +02:00
mskold@mysql.com
e0fe3e75c7 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-04-21 09:27:20 +02:00
pekka@mysql.com
737a866faa ndb - dbug aid for api signal log 2005-04-20 16:09:00 +02:00
mskold@mysql.com
c9e68705bb Removed forgotten abort() call, bug#10001 2005-04-20 11:08:53 +02:00
joreland@mysql.com
2a482eaf6f wl2455 - ndb tup scan
fix broken NR
2005-04-19 13:43:57 +02:00
joreland@mysql.com
2df2c4b895 CSC5149 - ndb test programs
Fix src distributions for benchmark prg
2005-04-19 11:17:32 +02:00
joreland@mysql.com
759298fda2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-19 11:06:11 +02:00
joreland@mysql.com
3dc5b1c90d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-18 12:47:47 +02:00
joreland@mysql.com
c0248b2186 bug#9892 - ndb index activation
4.1->5.0 merge fix
2005-04-18 12:46:35 +02:00
joreland@mysql.com
78d0b4526f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-18 12:45:17 +02:00
joreland@mysql.com
f931466f36 bug#9892
Make BUILDINDX RF_LOCAL aware
2005-04-18 12:41:12 +02:00
pekka@mysql.com
b485ce3dd5 ndb - use words not pages in schemafile table entry (5.1 compatible) 2005-04-17 19:01:18 +02:00
pekka@mysql.com
9ac0394446 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-04-14 22:27:43 +02:00
heikki@hundin.mysql.fi
31a49c3f73 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-04-14 22:33:17 +03:00
joreland@mysql.com
92c3f83528 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-14 13:46:32 +02:00
joreland@mysql.com
6799266b99 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-14 13:45:35 +02:00
joreland@mysql.com
27f7a6c41b BUG#9891 - ndb lcp
Crash if ACC_CONTOPREQ was sent while ACC_LCPCONF was in job buffer
  if ACC_LCPCONF would have arrived eariler (before TUP_LCPSTARTED)
  operations could lockup. 
  But would be restarted on next LCP

-- LQH
1) Better check for LCP started that will also return true
   if ACC or TUP already has completed
    
2) Remove incorrect if statement that prevented operations to
   be started if ACC has completed

-- ACC
Make sure all ACC_CONTOPCONF are sent before releasing lcp record
  i.e. use noOfLcpConf == 4 (2 ACC_LCPCONF + 2 ACC_CONTOPCONF)

Check for == 4 also when sending ACC_CONTOPCONF
2005-04-14 13:43:07 +02:00
joreland@mysql.com
5ffca20dcc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-14 13:32:38 +02:00
pekka@mysql.com
90a9342506 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/space/pekka/ndb/version/my50-ndb
2005-04-14 05:39:22 +02:00
pekka@mysql.com
768b1da09b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/export/space/pekka/ndb/version/my41
2005-04-14 05:01:44 +02:00
mskold@mysql.com
add3fd3cca Merge 2005-04-13 16:24:17 +02:00
mskold@mysql.com
e39ba63934 Merge 2005-04-13 14:08:54 +02:00
pekka@mysql.com
3c0a885fed ndb - bug#9865 fix error message 2005-04-13 13:40:53 +02:00
mskold@mysql.com
f5855f2d57 Fix for bug#9813: Test 'ndb_basic': Autoincrement fails in 64 bit 2005-04-13 12:42:23 +02:00
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