Commit graph

386 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
f02562b7fb Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj
2008-01-23 14:42:58 +01:00
jonas@perch.ndb.mysql.com
47f379d2f1 Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2008-01-23 10:28:30 +01:00
jonas@perch.ndb.mysql.com
94378f9189 Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gca
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2008-01-23 10:11:40 +01:00
gni@dev3-221.dev.cn.tlan
43f31db546 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2008-01-10 19:49:32 +08:00
gni@dev3-221.dev.cn.tlan
c891d92888 Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
2008-01-10 13:56:21 +08:00
gni@dev3-221.dev.cn.tlan
2351ac241d Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
2008-01-10 13:47:14 +08:00
tomas@whalegate.ndb.mysql.com
541db60153 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 10:32:21 +01:00
mskold/marty@mysql.com/quadfish.(none)
af908e61b7 bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixes 2007-12-07 11:05:19 +01:00
mskold/marty@quadfish.(none)
e051994b10 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-12-07 10:46:12 +01:00
gni/root@dev3-221.dev.cn.tlan
3f3be4f394 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug30271
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug30271
2007-11-14 10:52:29 +08:00
lzhou/zhl@dev3-63.(none)
04799ddbd9 BUG#29186 Return error to client in the following condition:
1: Create a log file which is larger than 4G in 32-bit host.
          2: Create a data file (tablespace) which is larger than 4G in 32-bit host.
2007-11-12 14:53:25 +00:00
tomas@whalegate.ndb.mysql.com
a214b1b9ba Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-10-30 11:28:19 +01:00
knielsen@loke.(none)
328fc573e4 Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
into  loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb
2007-10-25 10:48:42 +02:00
knielsen@loke.(none)
815a63008c Merge loke.(none):/home/knielsen/devel/bug31761
into  loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca
2007-10-25 09:27:15 +02:00
jonas@perch.ndb.mysql.com
ac1dc64ebb ndb - bug#26450
partial backport from 6.2 + add fix of bug
2007-10-23 11:24:34 +02:00
jonas@perch.ndb.mysql.com
dcb7fce7eb Merge perch.ndb.mysql.com:/home/jonas/src/51-simple-read
into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
2007-10-15 11:35:30 +02:00
jonas@perch.ndb.mysql.com
5aacf8b775 ndb - bug#31482
(re)impl. simple-read (read that releases lock just before LQHKEYCONF)
  use simple-read for blobs
2007-10-15 09:10:14 +02:00
mtaylor@solace.(none)
2a595c1bc1 Fixed a typo. We have NdbTransactions not NdbTransations. 2007-10-12 01:16:55 -07:00
mtaylor@solace.(none)
04342a487b Added SKIP_INTERNAL wrappers to mark new methods as not part of the public API. 2007-10-12 00:10:07 -07:00
mtaylor@solace.(none)
f178f7258d Fixed header to reflect the implementation.
Added accessor method to help out the NDB/Connectors.
2007-10-11 23:46:25 -07:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-10 14:15:09 -06:00
cmiller@zippy.cornsilk.net
04296df344 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-10-08 12:40:21 -04:00
pekka@sama.ndb.mysql.com
3dea240a6c Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndb
into  sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390
2007-10-04 18:37:49 +02:00
df@pippilotta.erinye.com
877b17d6e2 align types 2007-09-29 09:26:33 +02:00
stewart@willster.(none)
5a67e7ebd6 ndb_rand.c:
Rename: ndb/src/common/util/ndb_rand.c -> storage/ndb/src/common/util/ndb_rand.c
ndb_rand.h:
  Rename: ndb/include/util/ndb_rand.h -> storage/ndb/include/util/ndb_rand.h
2007-09-25 12:16:39 +02:00
tomas@whalegate.ndb.mysql.com
fc50cd5ab2 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-merge
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-07-13 10:35:03 +02:00
tomas@whalegate.ndb.mysql.com
e22ba29c2b fix ndb_version.h so that it is usable and make some functions public to handle ndb version 2007-07-11 14:36:44 +02:00
tomas@whalegate.ndb.mysql.com
e4c27d316e Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-07-05 13:37:51 +02:00
tomas@whalegate.ndb.mysql.com
8ab2c73d3a backport compute hash 2007-07-04 20:16:42 +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
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
Justin.He/justin.he@dev3-240.dev.cn.tlan
27430cd10b Merge jhe@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
2007-06-14 20:30:48 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
04931cfcd6 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug27640-5.0-ndb
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug27640-5.1-new-ndb
2007-06-14 19:57:50 +08:00
tomas@whalegate.ndb.mysql.com
48c43e00b9 Makefile.am:
new public file needs to get into distribution
2007-06-14 12:57:32 +02:00
tomas@whalegate.ndb.mysql.com
ca7180c73e get mgmapi error codes into perror 2007-06-14 12:35:35 +02:00
tomas@whalegate.ndb.mysql.com
e0f321333f 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-12 10:38:10 +02:00
tomas@whalegate.ndb.mysql.com
2606bb1ce5 Bug#29044 - memory buddy allocator "unoptimal" memory handling
- add config param to have better behavior with large tables
2007-06-12 10:35:21 +02:00
tomas@whalegate.ndb.mysql.com
352e93df73 internal interface to ndb (to be used by e.g. ndb_restore) 2007-06-11 17:19:20 +02:00
pekka@clam.ndb.mysql.com/ndb15.mysql.com
03fc4e6ca0 ndb - bug#28724 for blobs, op flag to not set error on trans (fix, recommit) 2007-06-08 12:27:52 +02:00
tomas@whalegate.ndb.mysql.com
016cf69867 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-06 16:51:04 +02:00
tomas@poseidon.mysql.com
8fd5212a9f Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-05 18:00:42 +02:00
tomas@poseidon.mysql.com
ce93bc3d13 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-06-05 17:51:53 +02:00
tomas@poseidon.mysql.com
47d5fb91d2 Bug #28751 Lots of memory locked in memory causes high kswapd
- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage
- writing odirect removes need for kernel write buffers avoiding kswapd to kick in
2007-06-05 17:29:50 +02:00
tomas@poseidon.mysql.com
8c35f44b21 Bug #28899 not possible to set separate watchdog timeout at startup 2007-06-05 17:06:33 +02:00
tomas@whalegate.ndb.mysql.com
c5e13ae053 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
2007-06-04 22:23:14 +02:00
jonas@perch.ndb.mysql.com
eab3e836e8 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-04 10:29:57 +02:00
jonas@perch.ndb.mysql.com
b8e43a1d9d ndb - make size of redo log files (fragment log files) configurable
using new config variable FragmentLogFileSize (4M - 1G)
2007-06-04 10:27:10 +02:00
mskold/marty@linux.site
9ad3721e95 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-05-28 15:00:18 +02:00
jani@a88-113-38-195.elisa-laajakaista.fi
fc3b3a0a86 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1
into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
2007-05-24 13:24:36 +03:00
tomas@whalegate.ndb.mysql.com
ffe2982b99 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
2007-05-21 09:01:06 +02:00