Commit graph

2323 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
0a1c65b6e3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-07-03 13:10:07 +02:00
jonas@perch.ndb.mysql.com
af76e150c8 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-07-03 08:41:52 +02:00
jonas@perch.ndb.mysql.com
b940b92ede Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-07-03 08:41:05 +02:00
jonas@perch.ndb.mysql.com
a3c733c395 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-07-02 14:08:22 +02:00
jonas@perch.ndb.mysql.com
627a56be1e ndb - bug#29364 - port merge (5.0 -> 5.1) 2007-07-02 13:59:17 +02:00
jonas@perch.ndb.mysql.com
b47ee8cec9 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-07-02 13:54:27 +02:00
lars/lthalmann@dl145j.mysql.com
a4c81471e8 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-07-02 13:42:39 +02:00
igor@olga.mysql.com
259fdbf9ca Merge olga.mysql.com:/home/igor/mysql-5.0-opt
into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt
2007-06-30 20:49:28 -07:00
tomas@poseidon.mysql.com
5d5b7ac244 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-28 07:08:37 +02:00
jonas@perch.ndb.mysql.com
c54681a48c 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-06-26 15:42:50 +02:00
jonas@perch.ndb.mysql.com
2411cbeecb 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-06-26 15:20:19 +02:00
jonas@perch.ndb.mysql.com
0e753bbb47 ndb - bug#29331 (51)
Add better handling of GCP Stop
    Only kill "offending" node
2007-06-26 15:19:42 +02:00
pekka@ndb13.mysql.com
e033bd20a6 Merge clam.ndb.mysql.com:/space/pekka/ndb/version/my51-gca
into  clam.ndb.mysql.com:/space/pekka/ndb/version/my51-bug29176
2007-06-25 09:16:43 +02:00
jonas@perch.ndb.mysql.com
ef74a65cf1 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-06-25 07:18:00 +02:00
jonas@perch.ndb.mysql.com
dfd8deebd5 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-06-25 07:14:21 +02:00
jonas@perch.ndb.mysql.com
259810d458 ndb - post merge 50/51 - bug#29057 bug#29067 and bug#29118 2007-06-25 07:12:27 +02:00
jonas@perch.ndb.mysql.com
3c3b680764 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-06-25 07:09:53 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
0946ceeb7d ndb - bug#29176 pgman: another missing stack pruning related to drop table 2007-06-24 22:14:09 +02:00
jmiller/ndbdev@mysql.com/ndb08.mysql.com
bbcfb1801a updated for bug#28770 2007-06-22 17:05:14 +02:00
tsmith@maint1.mysql.com
764a7a911c Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-22 11:30:17 +02:00
mats@kindahl-laptop.dnsalias.net
ad065829f2 Fixes to replication team tree. 2007-06-22 07:32:39 +02:00
mats@kindahl-laptop.dnsalias.net
6821e5ca5d BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
Removing dead code.
2007-06-22 02:27:18 +02:00
mats@kindahl-laptop.dnsalias.net
7672a81590 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
Minor fixes to get proper detection of transaction isolation level when
inside external_lock().
2007-06-22 01:08:26 +02:00
mats@kindahl-laptop.dnsalias.net
8e5d1784c9 Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl
into  kindahl-laptop.dnsalias.net:/home/bk/b23051-mysql-5.1-rpl
2007-06-21 21:35:26 +02:00
iggy@amd64.(none)
08cb616544 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  amd64.(none):/src/bug27029/my51-bug27029
2007-06-21 12:53:03 -04:00
iggy@amd64.(none)
adcf736687 Merge amd64.(none):/src/bug27029/my50-bug27029
into  amd64.(none):/src/bug27029/my51-bug27029
2007-06-21 12:47:55 -04:00
mats@kindahl-laptop.dnsalias.net
5491df5ae9 BUG#23051 (READ COMMITTED breaks mixed and statement-based replication):
Moving error generating code from table_flags() to external_lock().
2007-06-21 14:02:46 +02:00
tomas@whalegate.ndb.mysql.com
3bd4019fad Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-20 06:26:23 +02:00
tomas@whalegate.ndb.mysql.com
956b92059b Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-20 05:46:36 +02:00
tomas@whalegate.ndb.mysql.com
0510a696a9 Bug #29229 memory corruption in dbtup 2007-06-20 05:41:54 +02:00
tomas@whalegate.ndb.mysql.com
6a51e0f8a2 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl
2007-06-18 23:55:48 +02:00
tomas@whalegate.ndb.mysql.com
f3a7284521 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-18 23:49:30 +02:00
pekka@clam.ndb.mysql.com/ndb13.mysql.com
405f6a1681 ndb - bug#29176 missing stack pruning in drop_page 2007-06-18 16:03:41 +02:00
lars/lthalmann@dl145h.mysql.com
a2d93c53db Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 12:10:36 +02:00
lars/lthalmann@dl145j.mysql.com
ae52876fd0 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
2007-06-18 09:42:22 +02:00
jonas@perch.ndb.mysql.com
6d6eca5f3e 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-06-18 07:49:33 +02:00
jonas@perch.ndb.mysql.com
8308d3781b ndb - bug#29167
Fix case where all node in node group dies before they saved sysfile (wrt gcp)
  and Qmgr incorrectly thinks that "node group is missing"
2007-06-18 07:48:59 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 17:21:27 +02:00
istruewing@chilla.local
938fc3d66e Merge chilla.local:/home/mydev/mysql-5.1-amain
into  chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-16 13:14:23 +02:00
iggy@alf.
e0adab8ce7 Merge alf.:D:/src/mysql-5.1-maint
into  alf.:D:/src/mysql-5.1-maint_winemb
2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0 Embedded Server doesn't build on Windows.
- Add build configuration parameter EMBEDDED_ONLY which will configure 
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
2007-06-15 14:32:16 -04:00
bar@bar.myoffice.izhnet.ru
615297df8b Merge mysql.com:/home/bar/mysql-work/mysql-5.0.b28862
into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28862
2007-06-15 11:27:10 +05:00
antony@ppcg5.local
21c233440d Merge ppcg5.local:/Users/antony/Work/p2-bug25800.6
into  ppcg5.local:/Users/antony/Work/p2-bug25800.6.merge
2007-06-14 16:04:52 -07:00
mskold/marty@linux.site
2b2bdf74a3 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-06-14 21:57:30 +02:00
mskold/marty@linux.site
7b99f8a0fc 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-06-14 19:08:46 +02:00
tomas@whalegate.ndb.mysql.com
c9798697df Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-14 19:07:29 +02:00
tomas@whalegate.ndb.mysql.com
0da2eb5ce3 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-14 18:43:29 +02:00
mskold/marty@linux.site
754b7f59a4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-06-14 16:18:40 +02:00
tomas@whalegate.ndb.mysql.com
1c8219c58d bug#29099 - slow backup for disk data
- implement read ahead during disk data scan
2007-06-14 16:10:13 +02:00
mskold/marty@linux.site
c487c38111 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-06-14 16:10:11 +02:00