Commit graph

129 commits

Author SHA1 Message Date
jonas@perch.ndb.mysql.com
6011ad7868 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-08-28 16:03:51 +02:00
jonas@perch.ndb.mysql.com
b3ee645364 ndb - autotest
adopt to new error code 755 (invalid tablespace)
2006-08-28 08:32:14 +02:00
jonas@perch.ndb.mysql.com
97a956ca73 ndb - fix some bug in testSRBank 2006-08-25 16:47:31 +02:00
pekka@orca.ndb.mysql.com
4828d63cda Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-22 15:00:42 +02:00
pekka@orca.ndb.mysql.com
b97a4b7f44 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-08-22 10:24:58 +02:00
pekka@orca.ndb.mysql.com
e7508ad397 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug21017
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug21017
2006-08-21 23:45:02 +02:00
kent@mysql.com/g4-2.local
b329f2c3ef Many files:
Deleted config/ac-macros/ha_berkeley.m4
  Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
jonas@perch.ndb.mysql.com
73c58c3234 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-14 14:11:51 +02:00
jonas@perch.ndb.mysql.com
4db1bba0d0 ndb - bug#21271
make each fragment use own LCP file, so that (s/n)r can use different LCP-no for different fragments
2006-08-07 14:28:58 +02:00
jonas@perch.ndb.mysql.com
9cc27b6773 ndb - some hugo updates
make dump state args list const
  make node lists const
2006-08-07 12:12:55 +02:00
jonas@perch.ndb.mysql.com
dca8afa9c8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-08-02 08:08:23 +02:00
evgen@sunlight.local
0cb98e4f4a Makefile.am:
After merge fix
2006-08-01 19:56:22 +04:00
jonas@perch.ndb.mysql.com
a1e5f5b061 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-08-01 17:27:26 +02:00
jonas@perch.ndb.mysql.com
31e4b8db2c Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-08-01 17:12:22 +02:00
jonas@perch.ndb.mysql.com
3d42abedae ndb - add abort flag to hugoLoad 2006-08-01 17:10:17 +02:00
evgen@sunlight.local
ef4f149536 Merge sunlight.local:/local_work/tmp_merge-5.0-opt-mysql
into  sunlight.local:/local_work/tmp_merge-5.1-opt-mysql
2006-07-30 00:33:24 +04:00
stewart@willster.(none)
1496303771 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/main
2006-07-24 02:32:49 +10:00
pekka@orca.ndb.mysql.com
a3dcbff671 Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
into  orca.ndb.mysql.com:/space_old/pekka/ndb/version/my51-bug18781
2006-07-10 14:07:40 +02:00
tomas@poseidon.ndb.mysql.com
8a2694e25f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-07-04 11:21:19 +02:00
pekka@clam.ndb.mysql.com
ea794df45a ndb - bug#20751 : report also composite op in merge 2006-07-03 12:13:57 +02:00
jonas@perch.ndb.mysql.com
52e248a7d7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-29 16:23:38 +02:00
jonas@perch.ndb.mysql.com
ff2528f3c0 ndb -
ndbapi test of bug#20252
2006-06-28 11:38:22 +02:00
jonas@perch.ndb.mysql.com
b26e651f98 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-06-28 08:47:43 +02:00
jonas@perch.ndb.mysql.com
e9cbae32ea ndb - bug#20683
part 2 - handle safecounter.init() failing in all parts of event code
2006-06-26 12:31:09 +02:00
pekka@orca.ndb.mysql.com
09e8039aa4 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
2006-06-22 19:48:04 +02:00
pekka@clam.ndb.mysql.com
ac622fee7f ndb - bug#18781 post-merge 5.0->5.1 fixes (one more to come)
have to push this to be able to push 5.0
2006-06-22 19:26:15 +02:00
pekka@clam.ndb.mysql.com
7f9bfc2058 ndb - add test_event_merge to daily-devel-tests.txt 2006-06-21 17:17:12 +02:00
pekka@clam.ndb.mysql.com
6ba2b1845c ndb - bug#18102: fixes on NDB API level 2006-06-21 16:15:04 +02:00
pekka@clam.ndb.mysql.com
95aa9c28f2 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug19285
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug19285
2006-06-17 11:10:43 +02:00
pekka@clam.ndb.mysql.com
47a2004431 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my50-bug18781
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug18781
2006-06-15 14:49:48 +02:00
pekka@orca.ndb.mysql.com
0685030416 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51
2006-06-12 22:09:48 +02:00
pekka@clam.ndb.mysql.com
800e1e56a9 ndb - bug#19872 fix (sufficient for replication) 2006-06-12 18:00:06 +02:00
jonas@perch.ndb.mysql.com
e576b2460b ndb - testframework
impl. ugly flag to skip dict cache invalidation as it break all testSystemRestart testcases
2006-06-09 08:22:50 +02:00
jonas@mc01.ndb.mysql.com
b7ce47b28e Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-jonas
into mc01.ndb.mysql.com:/space/jonas/mysql-5.1-jonas
2006-06-08 16:33:17 +02:00
jonas@mc01.ndb.mysql.com
20903f8e49 merge 2006-06-08 16:11:55 +02:00
jonas@perch.ndb.mysql.com
25dc68e9f9 ndb - hugo
Print (and optionally specify) random seed
2006-06-08 15:43:41 +02:00
jonas@perch.ndb.mysql.com
22626ad28f ndb - bug#20185
update test prg + fix typo
2006-06-02 15:54:09 +02:00
jonas@perch.ndb.mysql.com
1829e60565 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-06-01 09:08:01 +02:00
jonas@perch.ndb.mysql.com
2a01de31ef 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
2006-06-01 08:49:14 +02:00
jonas@perch.ndb.mysql.com
b216a0281d Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-06-01 08:47:21 +02:00
jonas@perch.ndb.mysql.com
96f31a67ac Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-06-01 08:34:57 +02:00
jonas@perch.ndb.mysql.com
9c20aa944d ndb -
fix return value of "testBasic -n InsertError2 T1"
2006-05-31 08:22:54 +02:00
jonas@perch.ndb.mysql.com
8e0567e8ad ndb -
fix testNodeRestart -n Bug18612 when running with only 1 node group
2006-05-31 08:18:27 +02:00
pekka@mysql.com
ae964cb4cc Merge mysql.com:/space/pekka/ndb/version/my51
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-25 16:20:34 +02:00
jonas@perch.ndb.mysql.com
8b8aa227fd ndb -
increase max time of MassiveRollback
2006-05-22 08:46:19 +02:00
jimw@mysql.com
8262c3c38e Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-19 19:07:33 -07:00
jonas@perch.ndb.mysql.com
0e08504575 ndb -
fix scan bugs introduced by acc modifications
  add more error testcases
2006-05-19 16:29:48 +02:00
jonas@perch.ndb.mysql.com
0fd777214a ndb - bug#19293 and family
introduce acc per row logical mutex to fix difficult error handling cases
2006-05-18 10:17:53 +02:00
pekka@mysql.com
e10998672b Merge mysql.com:/space/pekka/ndb/version/my50-bug14509
into  mysql.com:/space/pekka/ndb/version/my51-bug14509
2006-05-17 12:56:59 +02:00
monty@mysql.com
3ecf4de288 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-05 11:38:05 +03:00