Commit graph

2150 commits

Author SHA1 Message Date
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
joreland@mysql.com
b15f8bcbaf Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:39:10 +02:00
joreland@mysql.com
0eb9947ce8 merge 2005-05-07 18:37:59 +02:00
joreland@mysql.com
5455e9ddd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:28:18 +02:00
joreland@mysql.com
347c21fe42 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 18:22:51 +02:00
joreland@mysql.com
4d1804ebb1 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 18:21:36 +02:00
joreland@mysql.com
749129487e ndb - autotest
fix configs and scripts
2005-05-07 18:20:29 +02:00
ndbdev@ndbmaster.mysql.com
e31a07265f ndb autotest - add show version to cpcd 2005-05-07 16:06:41 +02:00
joreland@mysql.com
678bef34a8 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 13:27:06 +02:00
joreland@mysql.com
85066eb0a2 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-07 13:25:52 +02:00
joreland@mysql.com
092eea3a7a ndb - autotest
fixes
2005-05-07 13:23:38 +02:00
joreland@mysql.com
86fe0ecf2d Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-07 12:00:13 +02:00
joreland@mysql.com
74b792b92b merge 2005-05-07 11:56:10 +02:00
joreland@mysql.com
129b3d4ab9 ndb - autotest
upgrades to shell script
2005-05-07 11:53:06 +02:00
pekka@mysql.com
8ccd11182f ndb - bug#8928 2005-05-07 10:56:03 +02:00
joreland@mysql.com
05d21f4ec3 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 19:23:11 +02:00
joreland@mysql.com
ff81ca1c05 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 19:22:02 +02:00
joreland@mysql.com
46265f9ad2 ndb - autotest
fix count of nodes needed in test
2005-05-06 19:20:32 +02:00
joreland@mysql.com
575c1edf5b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 18:59:37 +02:00
joreland@mysql.com
44fea2872d ndb - autotest
fix to ndb-autotest.sh
2005-05-06 18:58:46 +02:00
joreland@mysql.com
b76c160184 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 17:27:15 +02:00
joreland@mysql.com
80c2d9574a ndb - autotest
Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads
2005-05-06 17:26:22 +02:00
joreland@mysql.com
c93efc34ae Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 16:44:07 +02:00
joreland@mysql.com
2da6a86845 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:42:49 +02:00
joreland@mysql.com
df5eedb8aa ndb - autotest
put config files in bk
2005-05-06 16:41:46 +02:00
joreland@mysql.com
873ed5e0e7 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-06 16:16:25 +02:00
joreland@mysql.com
a5629a7ac7 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 16:15:57 +02:00
joreland@mysql.com
df80304435 ndb - autotest
use newly created script for faster handling of several configurations
2005-05-06 16:14:30 +02:00
joreland@mysql.com
9d0c542838 ndb - autotest
update make-config script
2005-05-06 15:37:51 +02:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:15:48 +02:00
joreland@mysql.com
deba12e775 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-06 14:46:19 +02:00
joreland@mysql.com
749a1f9a2b ndb - add support for mysql servers in autotest 2005-05-06 14:44:43 +02:00
ndbdev@ndbmaster.mysql.com
081933b02e ndb - add support for mysql servers in autotest 2005-05-06 12:46:52 +02:00
stewart@mysql.com
a17bf3f465 Bug#10193
Invalid DataDir in config causes ndbd segfault
2005-05-06 10:43:29 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
joreland@mysql.com
e1dad7a21b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-05 11:11:03 +02:00
joreland@mysql.com
3ebc4a271f Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-05-05 11:09:50 +02:00
joreland@mysql.com
208e534acc ndb - testNodeRestart -n LateCommit
increase no of rows so that the node failure will "guaranteed" produce an aborted transaction
2005-05-05 11:09:00 +02:00
joreland@mysql.com
1f58420332 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-05 10:41:04 +02:00
joreland@mysql.com
15bfe83479 merge 2005-05-05 10:39:20 +02:00
joreland@mysql.com
4238092864 bug#10142 - ndb unique index
post review fixes
2005-05-05 10:34:39 +02:00
joreland@mysql.com
97feb2df6a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 18:58:41 +02:00
joreland@mysql.com
a1faad1e64 merge 2005-05-04 18:48:33 +02:00
joreland@mysql.com
bf6e779b84 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 18:43:40 +02:00
joreland@mysql.com
0d17895910 bug#10358 - ndb
Cluster failure with non started nodes can result in timedout transactions
2005-05-04 18:40:54 +02:00
joreland@mysql.com
9ca0423435 merge 2005-05-04 17:29:41 +02:00
joreland@mysql.com
4a29d5b30e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-04 14:32:09 +02:00
joreland@mysql.com
86c7c4d1e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-05-04 14:29:33 +02:00
joreland@mysql.com
ef23f4295f bug#10330 - linking with ndb fails
changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places
2005-05-04 13:29:15 +02:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok:
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
2005-05-04 10:16:03 +02:00
joreland@mysql.com
7ebc32ee8b bug#10142 - ndb unhandle resource shortage in unique index code 2005-05-03 12:16:31 +02:00
joreland@mysql.com
74bf65d0e9 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-05-02 15:16:40 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
joreland@mysql.com
4766b99ec6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-28 06:57:59 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
joreland@mysql.com
d6f80c436c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-27 07:56:37 +02:00
pekka@mysql.com
f30749a08e ndb - wl#2455 fix 2005-04-25 12:55:24 +02:00
joreland@mysql.com
9572e1b72b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 12:01:03 +02:00
joreland@mysql.com
004ec3838d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 11:59:50 +02:00
joreland@mysql.com
280bef1845 bug#9749 - ndb lock upgrade
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.
2005-04-25 11:59:00 +02:00
joreland@mysql.com
208200cbe0 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 08:45:12 +02:00
joreland@mysql.com
b57eab4377 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:44:05 +02:00
joreland@mysql.com
12e0d4f588 ndb - autotest
add more tests to verify correctness of backups
2005-04-25 08:43:16 +02:00
joreland@mysql.com
9f0a7e1729 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-25 08:39:36 +02:00
joreland@mysql.com
c4d44841c4 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-25 08:38:28 +02:00
joreland@mysql.com
763d835a3c bug#9924 - ndb backup
remove incorrect assertion
2005-04-25 08:35:18 +02:00
joreland@mysql.com
08b7219de0 Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-24 20:39:42 +02:00
joreland@mysql.com
e1e050432d Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:38:53 +02:00
joreland@mysql.com
798e78787c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-24 20:37:31 +02:00
joreland@mysql.com
d9d1c933b0 bug#9924 - ndb backup - abort handling
uninit variable
2005-04-24 20:34:42 +02:00
pekka@mysql.com
48d6d545c0 ndb - post merge 4.1->5.0 2005-04-23 18:51:18 +02:00
pekka@mysql.com
850211eb73 Merge 2005-04-23 17:55:21 +02:00
pekka@mysql.com
6778b029e0 ndb - bug#10029 fix 2005-04-23 17:33:12 +02:00
pekka@mysql.com
9856a3e818 ndb - wl#2455 cont'd 2005-04-22 13:59:35 +02:00
joreland@mysql.com
cde3ff4d26 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-04-22 13:20:47 +02:00
joreland@mysql.com
c768e1d1e7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 13:07:35 +02:00
joreland@mysql.com
c770807edd Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 12:57:05 +02:00
joreland@mysql.com
3294a34ed2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 12:53:07 +02:00
pekka@mysql.com
4ff9b53b41 ndb - wl#2455 cont'd 2005-04-22 12:35:31 +02:00
joreland@mysql.com
c9d149fafe Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 11:13:56 +02:00
joreland@mysql.com
5f5f25c0bc Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 11:12:08 +02:00
joreland@mysql.com
0bfc924672 bug#9724 - ndb restart
if file already open occur print files...
2005-04-22 11:04:26 +02:00
joreland@mysql.com
8b07d761bc Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-04-22 09:51:13 +02:00
joreland@mysql.com
325918ee31 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-04-22 09:47:12 +02:00
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