Commit graph

1245 commits

Author SHA1 Message Date
tomas@poseidon.mysql.com
46bcfff2a5 ndb:
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
2007-01-25 11:17:51 +07:00
stewart@willster.(none)
76d4191379 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
2007-01-24 16:16:16 +11:00
jonas@eel.(none)
1e0418cfa2 ndb - bug#25794
Fix read after delete (in same op)
  - lqh, handling of attrinfo
  - tup, setup read for disk/varchar
2007-01-23 19:27:55 +01:00
stewart@willster.(none)
6d267551a3 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
2007-01-24 00:37:11 +11:00
stewart@willster.(none)
dbaab7f474 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
2007-01-24 00:34:12 +11:00
tomas@poseidon.mysql.com
9a85d74e2a Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 11:46:13 +07:00
tomas@poseidon.mysql.com
cd5f9b2f3e Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 07:25:24 +07:00
jonas@eel.(none)
b5fa32f0c0 ndb - bug#25286
- add some sanity check to marker/hash code to see that element isnt inserted twice into hashtable
    (if defined VM_TRACE or ERROR_INSERT)

  - allow REMOVE_MARKER_ORD to fail(dont find record) in release
2007-01-22 22:05:56 +01:00
jonas@perch.ndb.mysql.com
2e9fc22732 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 17:57:13 +01:00
jonas@eel.(none)
220eb32a3b ndb - bug#25755
remove accidently left debug prinouts
2007-01-22 17:29:11 +01:00
jonas@eel.(none)
e7e4dde51e ndb - bug#25755
Make sure subscriber is removed from list when n_subscribers is decreased
2007-01-22 17:25:49 +01:00
jonas@perch.ndb.mysql.com
bae96d8ddb Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 17:16:36 +01:00
jonas@eel.(none)
f7c6b13375 ndb - fix bug is NODE_VERSION_REP
Fix assertion in corner-case where signal isnt sent to any node
2007-01-22 17:06:27 +01:00
jonas@perch.ndb.mysql.com
68efcc062b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-20 03:02:39 +01:00
jonas@perch.ndb.mysql.com
162aa18e15 ndb - Fix bug when sending NODE_VERSION_REP 2007-01-20 03:01:37 +01:00
mtaylor@qualinost.(none)
9e24d548b6 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-19 16:58:03 -08:00
mtaylor@qualinost.(none)
d29c6a2547 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-19 14:30:41 -08:00
jonas@perch.ndb.mysql.com
9bef4afe9f Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 19:00:12 +01:00
jonas@perch.ndb.mysql.com
372cbc1def ndb - bug#19645
fix some more sp100 hang cases
2007-01-19 17:01:52 +01:00
jonas@perch.ndb.mysql.com
1c62054244 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-01-19 15:05:28 +01:00
jonas@perch.ndb.mysql.com
c8f5f7483b Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:02:29 +01:00
jonas@perch.ndb.mysql.com
31824a1329 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-19 15:00:49 +01:00
tomas@poseidon.mysql.com
9ca0af92b1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-19 11:36:39 +01:00
tomas@poseidon.mysql.com
9c8ab666b0 Bug#25387 ndb: dbug assert in reference counting for event operations
- on blob part execute failure, must leave in state executin, and await dropEventOperation
2007-01-19 11:35:00 +01:00
mtaylor@qualinost.(none)
3384251146 Add code to actually version the symbols in the library, and not just the library. bug #13522 2007-01-18 16:31:43 -08:00
mtaylor@qualinost.(none)
e4b3708e2c Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint
2007-01-18 15:12:57 -08:00
jonas@perch.ndb.mysql.com
7a133330f1 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-17 21:25:56 +01:00
jonas@perch.ndb.mysql.com
024fa0de88 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-17 21:23:59 +01:00
tomas@poseidon.mysql.com
79e80aac49 Bug#25387 - added comments in code suggestion during review 2007-01-17 10:53:42 +01:00
tomas@poseidon.mysql.com
ec0969f9de Bug#25387 - ndb: dbug assert in reference counting for event operations
- blob event operation not reference counted correctly, missing TE_ACTIVE
- add reference counting for blobs events
- make sure also blob event operations get TE_ACTIVE
- some minor cleanups + adjustment of dbug prints
2007-01-16 19:22:10 +01:00
jonas@perch.ndb.mysql.com
a441ea8b8f 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-01-16 19:01:34 +01:00
jonas@perch.ndb.mysql.com
c4163365a6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-16 18:59:31 +01:00
jonas@perch.ndb.mysql.com
045985df4f ndb - bug#25636
additional fix after autotest
  dont send start_fragreq to temporary tables such as ordered indexes...
2007-01-16 18:58:43 +01:00
mskold/marty@linux.site
53b252025b 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-01-16 14:33:40 +01:00
mskold/marty@mysql.com/linux.site
3c36b92a1d Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName 2007-01-16 09:19:41 +01:00
jonas@perch.ndb.mysql.com
633b32f443 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-15 21:05:14 +01:00
jonas@perch.ndb.mysql.com
b3c177073a ndb - bug#25636
Fix DD problem during NR after 3 missed LCP's
2007-01-15 21:03:39 +01:00
jonas@perch.ndb.mysql.com
c3b7512130 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-12 15:50:51 +01:00
jonas@perch.ndb.mysql.com
f8fdb7c997 ndb - bug#25587
fix not aligned or non 32-bit values in "smart" scan
2007-01-12 15:48:47 +01:00
jonas@perch.ndb.mysql.com
ef283377a9 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-01-11 21:13:17 +01:00
jonas@perch.ndb.mysql.com
cf53471347 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-11 21:09:27 +01:00
jonas@perch.ndb.mysql.com
a4570b092a fix merge error 2007-01-11 21:06:36 +01:00
jonas@perch.ndb.mysql.com
546c2f5069 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-11 21:02:38 +01:00
jonas@perch.ndb.mysql.com
403efda294 ndb - bug#25468
handle partially transfered LCP_FRAG_REP after node failure
  recommit to 51-work
2007-01-10 20:50:19 +01:00
jonas@perch.ndb.mysql.com
a1fdeba328 ndb - bug#25329
extra sledge hammer, (real 51)
  use dicklock to prevent SUB_START_REQ during node recovery
2007-01-04 11:13:19 +01:00
jonas@perch.ndb.mysql.com
8cf69ddb8b ndb - recommit extra version info to real-51 2007-01-04 10:59:12 +01:00
jonas@perch.ndb.mysql.com
db8cd1ec44 ndb - bug#25329
Fix most obvious error in dict/suma error handling of events
2007-01-04 10:03:11 +01:00
jonas@perch.ndb.mysql.com
c73b27f59b Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-03 06:47:23 +01:00
kent@mysql.com/kent-amd64.(none)
67868597bb Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
  Adjusted year(s) in copyright header 
  Added GPL copyright text
my_vle.h, rpl_utility.h, my_vle.c, base64-t.c, rpl_utility.cc:
  Changed copyright header formatting some
plugin_example.c, daemon_example.c:
  Added "Copyright (C) 2006 MySQL AB" to GPL header
2006-12-31 02:29:11 +01:00
kent@kent-amd64.(none)
58763e383e Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@kent-amd64.(none)
895e442dbf Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:04:59 +01:00
tomas@poseidon.
7b9a5f6de2 ndb: remove compiler warnings 2006-12-27 14:16:34 +01:00
tomas@poseidon.
044c410968 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
2006-12-27 11:01:54 +01:00
kent@mysql.com/kent-amd64.(none)
1e3237fefa Many files:
Changed header to GPL version 2 only
2006-12-27 02:23:51 +01:00
kent@kent-amd64.(none)
be15e3bc15 Merge mysql.com:/home/kent/bk/main/mysql-5.0
into  mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
mskold/marty@mysql.com/linux.site
f55af1eade ndb_dd_ddl.test, ndb_dd_ddl.result, ha_ndbcluster.cc:
bug#24667  After ALTER TABLE operation ndb_dd table becomes regular ndb: disallowed TABLESPACE declaration for STORAGE MEMORY
Makefile:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/Makefile -> storage/ndb/ndbapi-examples/mgmapi_logevent2/Makefile
mgmapi_logevent2.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent_dual.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp
Makefile:
  Rename mgmapi_logevent_dual to mgmapi_logevent2
mgmapi_logevent2.cpp:
  Rename: storage/ndb/ndbapi-examples/mgmapi_logevent_dual/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp
2006-12-20 15:15:26 +01:00
lzhou/zhl@dev3-63.dev.cn.tlan
328a8ccaf6 BUG#22261 remove global variable global_mgmt_server_check from ClusterMgr 2006-12-15 17:49:13 +00:00
jonas@perch.ndb.mysql.com
ec4030cf71 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-15 17:14:41 +01:00
jonas@perch.ndb.mysql.com
2e37545419 merge fix 2006-12-15 17:12:41 +01:00
jonas@perch.ndb.mysql.com
e8e875ca33 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-15 16:57:43 +01:00
gni/root@dev3-221.dev.cn.tlan
3397f66ae5 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
2006-12-14 19:08:11 +08:00
gni/root@dev3-221.dev.cn.tlan
eb0aec33e0 Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug21715
into  dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug21715
2006-12-14 18:52:37 +08:00
gni/root@dev3-221.dev.cn.tlan
975908c1fb BUG #19146 If Backup parameters incorrectly set, the data nodes can't start. 2006-12-14 18:10:18 +08:00
lzhou/zhl@dev3-63.dev.cn.tlan
08aac4349a Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into  dev3-63.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug22025
2006-12-12 20:19:32 +00:00
jonas@perch.ndb.mysql.com
691898c9a7 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-12 16:23:02 +01:00
jonas@perch.ndb.mysql.com
47a33ee5d0 ndb - bug#24949
make sure not too poll to long, in case of hb-failure of last db-node
2006-12-12 16:21:06 +01:00
jonas@perch.ndb.mysql.com
f176467bbd Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-12 13:31:03 +01:00
jonas@perch.ndb.mysql.com
05dd5fc20c ndb - bug#25001
make sure DISK flag is set on DATA column for blob table
2006-12-12 13:09:20 +01:00
jonas@perch.ndb.mysql.com
6caf18ca8c ndb - style
split assignment into 2 lines
2006-12-12 13:07:22 +01:00
jonas@perch.ndb.mysql.com
57d7f39556 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-11 16:19:22 +01:00
jonas@perch.ndb.mysql.com
7766aa089e ndb - bug#24664
Fix in bug fix, make sure LCP_SKIP is only used for inserts...
2006-12-11 16:18:34 +01:00
jonas@perch.ndb.mysql.com
11edb43a37 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-08 22:18:59 +01:00
jonas@perch.ndb.mysql.com
3358f4f14b ndb - bug#24917 2006-12-08 17:21:29 +01:00
jonas@perch.ndb.mysql.com
6f01db2285 ndb - bug#24914
Fix start transaction with hint from ndbapi
2006-12-08 16:15:59 +01:00
jonas@perch.ndb.mysql.com
a460d5f288 ndb - bug#21948
Fix bug in previous changeset...causing SR problems with disk
2006-12-08 10:24:48 +01:00
jonas@perch.ndb.mysql.com
ca3d0cf5b0 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-07 15:25:40 +01:00
jonas@perch.ndb.mysql.com
3ab75d971d ndb - bug#21948 & bug#17605
fix alloc/free extent in undo log
  allow extent to be reused once a lcp is finished (instead of when next lcp starts)
2006-12-07 15:25:02 +01:00
jonas@perch.ndb.mysql.com
4456144c58 ndb - add support for periodic mem-reporting 2006-12-06 14:38:32 +01:00
jonas@perch.ndb.mysql.com
174d561489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-06 13:28:13 +01:00
jonas@perch.ndb.mysql.com
b7deb4dcec Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-06 13:10:00 +01:00
jonas@perch.ndb.mysql.com
315a4e18c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-05 22:45:17 +01:00
msvensson@neptunus.(none)
90226bbc33 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-05 19:19:58 +01:00
msvensson@neptunus.(none)
d8e6f01396 Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-05 18:50:46 +01:00
jonas@perch.ndb.mysql.com
d720cd2786 ndb - bug#24664
1) run lcp snapshot for both MM and DD tables (so I dont have to change restore to use WRITE)
  2) fix >= and > bug in lcp skip/keep handling
  3) very cool test prog for this :-)
2006-12-05 15:10:56 +01:00
mskold/marty@linux.site
2b3789dd5a Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-05 09:38:12 +01:00
tsmith/tim@siva.hindu.god
97f48ef129 Change ::fileno() to fileno() in ndb/common/util/File.cpp.
fileno(), and many other stdio functions, may be macros
(at least on *BSD).

Don't explicitly qualify it with global scope (::fileno()),
because it causes syntax errors.

<cstdio> doesn't define *most* of these macros.

It still has a macro for fileno(), however, on FreeBSD 6.1,
so even using <cstdio> isn't a fix for this.  Better to
just avoid ::standard_library_function() in general, in
order to be portable.
2006-12-04 14:41:08 -07:00
msvensson@neptunus.(none)
6072b7a4c4 Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-12-04 18:44:14 +01:00
jonas@perch.ndb.mysql.com
630636a27c ndb - bug#24166
SR crash if table with disk with hidden primary key...
2006-12-04 10:06:51 +01:00
lzhou/zhl@ts3-34.ts.cn.tlan
da0ce3628b BUG#22025 Return correct error message when transporter error occored 2006-12-01 20:57:07 +00:00
mskold/marty@linux.site
6f0e7a2631 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 21:12:13 +01:00
mskold/marty@linux.site
9e56779f97 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-12-01 16:44:50 +01:00
mskold/marty@linux.site
93b7491421 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-12-01 16:37:13 +01:00
mskold/marty@mysql.com/linux.site
cde79e4f79 Changed mysql.apply_status, mysql.binlog_index, and mysql.schema to mysql.ndb_apply_status, mysql.ndb_binlog_index, and mysql.ndb_schema 2006-12-01 15:49:07 +01:00
jonas@perch.ndb.mysql.com
7a0179e178 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-01 14:06:15 +01:00
jonas@perch.ndb.mysql.com
764304031d ndb - bug#24655
Handle events "differently" so that dict doesnt get lock too often
2006-12-01 14:04:06 +01:00
jonas@perch.ndb.mysql.com
fc09c8a62d Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-01 13:58:24 +01:00
jonas@perch.ndb.mysql.com
32c67ca05f Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-12-01 11:32:52 +01:00
jonas@perch.ndb.mysql.com
37f97b29c0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-01 11:25:08 +01:00
jonas@perch.ndb.mysql.com
13c44a9197 ndb - bug#24717
fixes to testprogram to test new impl. in 5.1
2006-12-01 11:08:53 +01:00
jonas@perch.ndb.mysql.com
75467cc9f1 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-01 10:33:28 +01:00
jonas@perch.ndb.mysql.com
f1722c76a0 ndb -
fix merge error
2006-12-01 10:29:45 +01:00
pekka@orca.ndb.mysql.com
b304b3f8e1 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-12-01 10:10:22 +01:00
jonas@perch.ndb.mysql.com
b20c6e69ad ndb - bug#24717
5.1 version
  remove 5.0 version
  add general routing signal
  send tckeyref routed if needed...
2006-12-01 09:37:17 +01:00
jonas@perch.ndb.mysql.com
8f4dc87d98 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-12-01 09:14:12 +01:00
jonas@perch.ndb.mysql.com
3bf0a9d311 ndb - bug#24476
Fix typo that yeilded rare crash in ACC
2006-12-01 08:54:28 +01:00
gni/root@ts3-168.ts.cn.tlan
dfd2c8f4fb For merging mysql-5.1-new-ndb-bj tree into mysql-5.1-new-ndb tree 2006-12-01 12:16:25 +08:00
gni/root@ts3-168.ts.cn.tlan
24b1feea03 Merge ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  ts3-168.ts.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
2006-12-01 11:35:05 +08:00
pekka@orca.ndb.mysql.com
6758c1679c ndb - bug#21690: fix typo which changed blob parts distribution 2006-12-01 02:06:37 +01:00
monty@narttu.mysql.fi
430d215c58 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-30 22:38:12 +02:00
msvensson@neptunus.(none)
5f7f1329ee Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-30 17:15:05 +01:00
mskold/marty@linux.site
34cfad6486 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:48:28 +01:00
mskold/marty@linux.site
d7e375680a Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-30 15:31:20 +01:00
mskold/marty@linux.site
6db1610c21 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-30 14:45:54 +01:00
mskold/marty@mysql.com/linux.site
9169edf348 Removed return of illegal pointer, changed signatures to ndb_mgm_get_clusterlog_severity_filter and ndb_mgm_get_clusterlog_loglevel 2006-11-30 13:30:59 +01:00
monty@mysql.com/narttu.mysql.fi
3a35c30027 Fixed compiler warnings (Mostly VC++):
- Removed not used variables
- Changed some ulong parameters/variables to ulonglong (possible serious bug)
- Added casts to get rid of safe assignment from longlong to long (and similar)
- Added casts to function parameters
- Fixed signed/unsigned compares
- Added some constructores to structures
- Removed some not portable constructs

Better fix for bug Bug #21428 "skipped 9 bytes from file: socket (3)" on "mysqladmin shutdown"
(Added new parameter to net_clear() to define when we want the communication buffer to be emptied)
2006-11-30 03:40:42 +02:00
kent@mysql.com/kent-amd64.(none)
ea5c7f9756 Many files:
Changed paths to ndb include directory to include "storage"
Makefile.am:
  Adjusted path to yaSSL libtool libraries
ssl.m4:
  Use libtool way of specifying yaSSL libraries
2006-11-29 18:36:51 +01:00
jonas@perch.ndb.mysql.com
e699ca7304 ndb - bug#24105
Handle not started nodes correctly (for X restart)
  i.e dont wait for NF_COMPLETEREP
      but settle with NODEFAIL_REP
2006-11-29 13:10:14 +01:00
mskold/marty@linux.site
77a59a1f48 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-11-29 11:55:52 +01:00
kent@kent-amd64.(none)
2264dc7da0 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/kent/bk/mysql-5.1-build
2006-11-28 18:31:53 +01:00
msvensson@neptunus.(none)
e135cbde89 Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-28 16:54:49 +01:00
jonas@perch.ndb.mysql.com
9381d8c431 ndb - bug#24544
fix so backup message is printed even in case of "ndb_mgm -e"
2006-11-28 15:11:13 +01:00
monty@mysql.com/nosik.monty.fi
93f246d4c1 Fixed portablity problem
Removed warnings from mysqltest scripts
2006-11-28 05:43:30 +02:00
kent@kent-amd64.(none)
e99c548bcd Merge mysql.com:/home/kent/bk/mysql-5.0
into  mysql.com:/home/kent/bk/mysql-5.1
2006-11-27 23:12:05 +01:00
monty@mysql.com/nosik.monty.fi
0e149b7170 Removed compiler warnings
Ensure that my_size_t is always unsigned (to get predictiable results from system to system)
Removed some %lld, as these are not portable
2006-11-27 18:16:08 +02:00
mskold/marty@mysql.com/linux.site
9f572b7d4b bug#24470 MySQL Servers crashes during creating new tables with blob column: fix of error handling at resource shortage 2006-11-27 11:49:43 +01:00
monty@mysql.com/nosik.monty.fi
fa81a82e7f Fixed a LOT of compiler warnings
Added missing DBUG_RETURN statements (in mysqldump.c)
Added missing enums
Fixed a lot of wrong DBUG_PRINT() statements, some of which could cause crashes
Removed usage of %lld and %p in printf strings as these are not portable or produces different results on different systems.
2006-11-27 01:47:38 +02:00
msvensson@neptunus.(none)
58a8b34e20 Merge bk-internal:/home/bk/mysql-5.1
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-11-23 18:28:16 +01:00
jonas@perch.ndb.mysql.com
60b19639b9 ndb - bug#24543
Resend if master dies during alloc node id
2006-11-23 14:34:24 +01:00
monty@nosik.monty.fi
89570bf966 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-11-22 14:11:36 +02:00
monty@nosik.monty.fi
38a92caeb7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2006-11-21 23:12:45 +02:00
monty@mysql.com/nosik.monty.fi
f6682e2743 Added --debug-info to most clients to detect memory leaks in mysql-test-run
Moved .progress files into the log directory
Moved 'cluster' database tables into the MySQL database, to not have 'cluster' beeing a reserved database name
Fixed bug where mysqld got a core dump when trying to use a table created by MySQL 3.23
Fixed some compiler warnings
Fixed small memory leak in libmysql
Note that this doesn't changeset doesn't include the new mysqldump.c code required to run some tests. This will be added when I merge 5.0 to 5.1
2006-11-21 22:32:58 +02:00
jonas@perch.ndb.mysql.com
32f4f8908e ndb - no bugs number
1) Make sure not to read uninitialized data in unique index code
      harmless (atleast before dynattr)
  2) Dont update p_latest_trans_gci
      for dirty unique index lookup
2006-11-21 14:23:42 +01:00
jonas@perch.ndb.mysql.com
b455689440 ndb - bug#24331
Make sure LCP scan record is correct initialized
2006-11-21 14:21:11 +01:00
jonas@perch.ndb.mysql.com
9e0be46731 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-11-21 14:18:52 +01:00
msvensson@neptunus.(none)
dad28e635d Fix DBUG_ENTER to print the correct function name 2006-11-21 12:53:05 +01:00
jonas@perch.ndb.mysql.com
60dbbadd64 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-11-21 12:06:34 +01:00
jonas@perch.ndb.mysql.com
1a1b112a3e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-11-21 11:59:21 +01:00
msvensson@shellback.(none)
d2c45ec3c5 Bug#24361 valgrind error when shutting down mysqld connected to cluster
- Disconnect from transporter before starting to delete objects
2006-11-20 21:11:45 +01:00
msvensson@neptunus.(none)
ad47d85a90 Bug#24361 valgrind error when shutting down mysqld connected to cluster
- Disconnect from transporter before starting to delete objects
2006-11-17 13:18:09 +01:00
pekka@orca.ndb.mysql.com
caaadb9b05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-misc
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-misc
2006-11-16 18:15:03 +01:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
c4151cc450 Merge dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-47.dev.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/bug19203-5.1-new-ndb-bj
2006-11-14 09:56:30 +08:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
40888f48b9 BUG#19808, Online config. Wrong error message if DataMemory less than a data on cluster 2006-11-14 09:33:43 +08:00
mskold/marty@linux.site
e7a356a99d Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-13 13:01:31 +01:00
Justin.He/justin.he@dev3-47.dev.cn.tlan
6f2724a251 Bug#19203, Different error reports for similar cases - unable allocate memory 2006-11-13 15:31:59 +08:00
mskold/marty@linux.site
6ad1b4f92c Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-11-10 11:38:54 +01:00
stewart@willster.(none)
2f20405ebc BUG#24143 Heavy file fragmentation with multiple ndbd on single fs
If we have the XFS headers (at build time) we can use XFS specific ioctls
(once testing the file is on XFS) to better allocate space.

This dramatically improves performance of mysql-test-run cases as well:

e.g.
number of extents for ndb_dd_basic tablespaces and log files
BEFORE this patch: 57, 13, 212, 95, 17, 113 
WITH this patch  :  ALL 1 or 2 extents

(results are consistent over multiple runs. BEFORE always has several files
with lots of extents).

As for timing of test run:
BEFORE
ndb_dd_basic                   [ pass ]         107727
real    3m2.683s
user    0m1.360s
sys     0m1.192s

AFTER
ndb_dd_basic                   [ pass ]          70060
real    2m30.822s
user    0m1.220s
sys     0m1.404s

(results are again consistent over various runs)

similar for other tests (BEFORE and AFTER):
ndb_dd_alter                   [ pass ]         245360
ndb_dd_alter                   [ pass ]         211632
2006-11-10 01:08:35 +11:00
stewart@willster.(none)
e07d563a4d Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
2006-11-08 15:23:46 +11:00
stewart@willster.(none)
753d0a3ad1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
2006-11-08 15:15:50 +11:00
jonas@perch.ndb.mysql.com
10b082f02a Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-11-07 13:59:46 +01:00
jonas@perch.ndb.mysql.com
4bf35faaf2 ndb - bug#24039
Make sure index scan does not commitDelete
2006-11-07 13:59:14 +01:00
jonas@perch.ndb.mysql.com
15f996f355 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-11-06 15:12:08 +01:00
jonas@perch.ndb.mysql.com
ebf4de96e3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-11-06 15:09:58 +01:00
stewart@willster.(none)
e4f6760016 BUG#20065 Erroneous error message at Node Restart if MaxNoOfOrderedIndexes changed too low
nicer error message to user, along with error code to help track down the problem.
2006-11-03 19:05:09 +11:00
stewart@willster.(none)
dd2cea1698 remove OSE 2006-11-03 02:18:45 +11:00
stewart@willster.(none)
be7baa4f75 BUG#22309 FileLogHandler::createNewFile() isn't thread safe - may loose log messages
BUG#22305  	SysLogHandler not thread safe
BUG#22313  	can get duplicate log messages in cluster log

Fix all these problems with one patch. Make Logger, hence EventLogger (with a 
bit more) thread safe.
2006-11-03 01:12:30 +11:00
stewart@willster.(none)
d345a1fdf7 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-mgm-work
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-mgm-work
2006-11-02 23:46:59 +11:00
lzhou/root@dev3-138.dev.cn.tlan
c10719c605 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19352
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19352
2006-11-02 11:03:48 +00:00
kostja@bodhi.local
aaeef40e72 Merge bodhi.local:/opt/local/work/mysql-5.0-runtime
into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
2006-11-02 03:30:16 +03:00
joerg@trift2.
0d27df6f1a Merge trift2.:/MySQL/M51/clone-5.1
into  trift2.:/MySQL/M51/push-5.1
2006-11-01 13:26:03 +01:00
lzhou/root@dev3-138.dev.cn.tlan
b5e13ac17d Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21052
2006-11-01 10:53:24 +00:00
jonas@perch.ndb.mysql.com
a172a5dc63 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-10-27 16:38:12 +02:00
jonas@perch.ndb.mysql.com
ebcc594ea3 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-27 16:37:16 +02:00
pekka@orca.ndb.mysql.com
0dac23f627 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
2006-10-25 17:32:32 +02:00
knielsen@ymer.(none)
e43c5fca48 Merge ymer.(none):/usr/local/mysql/mysql-4.1-ndb.tmp
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
2006-10-25 10:44:22 +02:00
jonas@perch.ndb.mysql.com
d9d7c7859a Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-25 08:49:35 +02:00
jonas@perch.ndb.mysql.com
5230dcebcc 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-10-25 08:45:06 +02:00
jonas@perch.ndb.mysql.com
cfd146d911 5.1.12 - release clone
ndb - revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-23 09:48:36 +02:00
jonas@perch.ndb.mysql.com
79d8773e31 ndb -
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
2006-10-22 08:24:31 +02:00
jonas@perch.ndb.mysql.com
bcb92268e7 merge 2006-10-20 16:26:40 +02:00
jonas@perch.ndb.mysql.com
c2dcd9a9f0 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-20 16:25:14 +02:00
jonas@perch.ndb.mysql.com
ff05ba5131 ndb - bug#23494
Fix bug in restore with table with many columns, Compute size of databuffer pool correctly
2006-10-20 14:37:34 +02:00
jonas@perch.ndb.mysql.com
07c6a601ea ndb -
Add better error message if getting error in RESTORE
2006-10-20 14:36:39 +02:00
jonas@perch.ndb.mysql.com
6980a0090f merge 2006-10-20 14:35:22 +02:00
jonas@perch.ndb.mysql.com
4218eb0fde Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-20 14:31:39 +02:00
gni/root@dev3-127.(none)
39336ce2a1 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21858
2006-10-20 16:38:26 +08:00
gni/root@dev3-127.(none)
ab01dd733f BUG #21858 Make sure retry when EINTR returns, which decreases memory leak chance. 2006-10-20 14:55:14 +08:00
gni/root@dev3-127.(none)
8646e145b4 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug14612
2006-10-20 13:01:25 +08:00
gni/root@dev3-127.(none)
7804e6e189 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-new-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug22547
2006-10-20 11:32:21 +08:00
dli@dev3-76.dev.cn.tlan
ab9eac49d1 ndb - bug#22548, Data nodes fail during starting if MaxNoOfUniqueHashIndexes has upper limit.
added check in ndb_mgmd so that the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max Uint32 number.
2006-10-20 10:54:27 +08:00
pekka@orca.ndb.mysql.com
16ff0ddb4c Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-tux
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-tux
2006-10-19 12:29:24 +02:00
jonas@perch.ndb.mysql.com
d82797ec8f Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-19 11:23:34 +02:00
jonas@perch.ndb.mysql.com
61d7b5ca42 ndb - add temporary tables to hugo
and use it for testOperations/testTransactions
2006-10-19 11:20:04 +02:00
jonas@perch.ndb.mysql.com
5f69741462 ndb - bug#22672
fix another incorrect assertion
2006-10-19 11:18:04 +02:00
jonas@perch.ndb.mysql.com
5feaf8cafd ndb - fix incorrect assertion
Dont assert when getting gci=0 in read only transaction
2006-10-19 10:43:25 +02:00
jonas@perch.ndb.mysql.com
e3d84b36db Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-19 10:29:52 +02:00
gni/root@dev3-127.(none)
9c9bf8a0bf BUG #22547 LongMessageBuffer too large causes ndbd to exit and gives the exact paramter name in error log. 2006-10-19 13:49:32 +08:00
jonas@perch.ndb.mysql.com
0192b43927 ndb - bug#23430
make sure not to release log buffer twice (or several times) in case of abort of multi update
2006-10-18 20:54:25 +02:00
stewart@willster.(none)
1d70db173f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 22:23:14 +10:00
gni/root@dev3-127.(none)
153e456cf1 BUG #14612 If a restore is done on a slave cluster, yet the apply_status and schema tables don't exist,
ndb_restore tool should create them.
2006-10-18 18:12:55 +08:00
stewart@willster.(none)
71636edc16 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-merge
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
2006-10-18 18:51:39 +10:00
stewart@willster.(none)
467903724c Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug21253
2006-10-18 18:41:43 +10:00
stewart@willster.(none)
73831dad50 Bug #19148 Backup causes cluster down if _really_ early abort happens
Early abort, failing to allocate buffers, would go down the abort track and
 end up trying to sendDropTriggers (as the standard stop backup does). 
However, it is possible to not have any tables yet defined in the backup 
(due to allocating buffers is before this). Simple check in sendDropTrig 
(and continue to next step). Files may be open, so we continue to close them.

Also updated ERROR_Codes (and added one to test this bug).
2006-10-18 18:19:16 +10:00
jonas@perch.ndb.mysql.com
5bce99a90b ndb -
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
2006-10-18 10:07:02 +02:00
Justin.He/justin.he@qa3-104.qa.cn.tlan
0cd9eff5ad Bug#19454: Some values of MaxNoOfTriggers can stop a server
correct segment fault in setSize(), 
and improve the error message with displaying the specific parameter's name if malloc fail
2006-10-18 13:45:41 +08:00
Justin.He/justin.he@qa3-104.qa.cn.tlan
0192e8ab20 add a new mgmapi ndb_mgm_get_db_parameter_info, which retrieve parameter's name 2006-10-18 11:06:35 +08:00
jonas@perch.ndb.mysql.com
6439d381a0 ndb - fix some ndb strict-alias problems
found with gcc 4.0.2 on Itanium2
  (ndb_dd_* failures)
2006-10-16 23:37:00 +02:00
pekka@orca.ndb.mysql.com
6b6cac0ded 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-bug21191
2006-10-16 11:44:53 +02:00
stewart@willster.(none)
975e2f37b9 BUG#21253 NdbApi.h should not include my_config.h 2006-10-16 17:01:01 +10:00
pekka@orca.ndb.mysql.com
e52bd4be2b 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-bug21191
2006-10-15 12:11:52 +02:00
mmj@tiger.local
8353d3e69e DictTabInfo.cpp:
Fix for bug#23169 - memset param switching
2006-10-14 00:42:39 +02:00
lzhou/root@dev3-138.dev.cn.tlan
fb1a54aac3 BUG#21296 Add error messages when upgrading data node 2006-10-13 13:48:04 +00:00
jonas@perch.ndb.mysql.com
64cba8676a fix merge problem 2006-10-13 13:54:47 +02:00
jonas@perch.ndb.mysql.com
44310b1430 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-13 12:13:09 +02:00
jonas@perch.ndb.mysql.com
d0bd8a8a41 ndb - fix memleak (due to incorrect merge of bug#21941)
recommit into release-clone
2006-10-13 10:11:18 +02:00
stewart@willster.(none)
a5e99f90c5 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/main
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
2006-10-13 15:12:57 +10:00
dli@dev3-76.dev.cn.tlan
f908b0dd0b Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-new-ndb-bj
2006-10-13 09:38:41 +08:00
jonas@perch.ndb.mysql.com
06eb6c1b95 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-12 19:01:15 +02:00
jonas@perch.ndb.mysql.com
a54087870c Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-12 18:58:52 +02:00
jonas@perch.ndb.mysql.com
cce815f787 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-12 14:09:03 +02:00
dli@dev3-76.dev.cn.tlan
352a9f64d2 fixed for BUG#21519, 'MySQLD Err msg "Management server closed connection" needs date & time stamp'.
added date & time stamp for the messages that will be printed to the mysqld message file.
2006-10-12 10:31:27 +08:00
pekka@orca.ndb.mysql.com
375faa3b52 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
2006-10-11 05:16:50 +02:00
lars@black.(none)
0b4e65e12b Merge mysql.com:/home/bkroot/mysql-5.1-new-rpl
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-10-10 21:59:23 +02:00
jonas@perch.ndb.mysql.com
84e4df338d Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-10 15:27:47 +02:00
jonas@perch.ndb.mysql.com
94b8e56144 ndb -
ndb_restore Return OK even if temporary errors
    (otherwise mysql-test-run/ndb_restore can fail on really slow machines)
2006-10-10 15:26:39 +02:00
jonas@perch.ndb.mysql.com
e600a3d394 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-10 11:25:24 +02:00
jonas@perch.ndb.mysql.com
fe61968dc8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-10-10 11:08:23 +02:00
jonas@perch.ndb.mysql.com
5590e99d2e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-10-10 11:06:51 +02:00
pekka@orca.ndb.mysql.com
e524d16707 ndb - tux scan 5.1 post-merge fix 2006-10-09 20:46:29 +02:00
pekka@orca.ndb.mysql.com
b084401165 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
2006-10-09 16:40:57 +02:00
pekka@orca.ndb.mysql.com
ae1b40ba05 Merge orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my50-bug20446
into  orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-bug20446
2006-10-09 14:44:40 +02:00
mats@romeo.(none)
d4d26ba7d5 Merge romeo.(none):/home/bkroot/mysql-5.1-new-rpl
into  romeo.(none):/home/bk/b19459-mysql-5.1-new
2006-10-06 15:31:05 +02:00
stewart@willster.(none)
3551165c90 Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug21154
into  willster.(none):/home/stewart/Documents/MySQL/5.1/bug13987

Merge 5.0-ndb into 5.1-ndb
2006-10-05 23:13:29 +10:00
jonas@perch.ndb.mysql.com
0b5ad7f38b ndb - bug#17929
guess which scan type to use in handler
2006-10-05 14:25:18 +02:00
jonas@perch.ndb.mysql.com
c3e20d907e 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-10-04 11:42:50 +02:00
knielsen@bk-internal.mysql.com
a96d7250e8 Merge bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-ndb-bj
into  bk-internal.mysql.com:/dev/shm/knielsen/mysql-5.1-new-ndb
2006-10-04 11:33:28 +02:00
jonas@perch.ndb.mysql.com
c878ff37e2 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-10-04 09:49:11 +02:00
stewart@willster.(none)
838e616413 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/cleanup
into  willster.(none):/home/stewart/Documents/MySQL/5.1/pending
2006-10-04 14:37:01 +10:00
mats@romeo.(none)
7b85fb5c13 BUG#19459 (BINLOG RBR command does not lock tables correctly causing
crash for, e.g., NDB):
Submitting patch to base64_decode() adding extra parameter.
2006-10-02 15:05:05 +02:00
pekka@orca.ndb.mysql.com
7edad61c8a ndb - bug#21191: test pgm: testIndexStat 2006-10-01 16:05:53 +02:00
dli@dev3-76.dev.cn.tlan
273de17cce Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19651
2006-09-28 20:52:28 +08:00
jonas@perch.ndb.mysql.com
b0b69bac4a Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-09-26 16:14:05 +02:00
jonas@perch.ndb.mysql.com
d6ae4c1748 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-09-26 15:33:03 +02:00
pekka@orca.ndb.mysql.com
c9e53b3f11 ndb - bug#21690: cleanup: set column properties in any order before create 2006-09-26 14:21:52 +02:00
jonas@perch.ndb.mysql.com
ea12fac469 ndb - post merge fixes... 2006-09-26 14:08:20 +02:00
jonas@perch.ndb.mysql.com
e609add790 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-09-26 13:58:34 +02:00
mskold/marty@linux.site
5e60232da9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
2006-09-22 21:14:58 +02:00
gni/root@dev3-127.(none)
493e5ddbfa Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-ndb-bj
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21585
2006-09-22 20:28:12 +08:00
gni/root@dev3-127.(none)
c26952192b BUG@21585 The --help option shows a screen of command options for the ndbd, ndb_mgmd, ndb_mgm
and other commands related to ndb. For all of these, the help screen contains 
           "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete.
2006-09-22 20:22:50 +08:00
gni/root@dev3-127.(none)
6991a44d48 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug20575
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug20575
2006-09-22 19:30:37 +08:00
Justin.He/justin.he@qa3-104.qa.cn.tlan
a479482727 Merge qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.0/bug21036-mysql-5.0
into  qa3-104.qa.cn.tlan:/mnt/sda7/justin.he/mysql/mysql-5.1/mysql-5.1-ndb-bj
2006-09-21 10:22:20 +08:00
dli@dev3-76.dev.cn.tlan
3cf3a9211b Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-ndb-bj
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
2006-09-20 18:56:38 +08:00
lzhou/root@dev3-138.dev.cn.tlan
aa6107031b BUG#21799 manual modify variable name. 2006-09-20 10:56:37 +00:00
dli@dev3-76.dev.cn.tlan
2724451f83 Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-20395
into  dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-20395
2006-09-20 10:25:31 +08:00
lzhou/root@dev3-138.dev.cn.tlan
6180aada88 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21799
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug21799
2006-09-19 18:08:14 +00:00
acurtis/antony@xiphis.org/ltamd64.xiphis.org
98a8537adf Bug#22417
"plug.in not included in dist source"
2006-09-18 19:31:08 -07:00
gni/root@dev3-127.(none)
98941f7f18 Merge dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0/bug21530
into  dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.1/mysql-5.1-bug21530
2006-09-18 14:14:08 +08:00
msvensson@shellback.(none)
f1e91ec7f7 Merge shellback.(none):/home/msvensson/mysql/work/my50-work
into  shellback.(none):/home/msvensson/mysql/work/my51-work
2006-09-15 17:00:09 +02:00
jonas@perch.ndb.mysql.com
64bf33836e Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-09-15 11:43:49 +02:00
lzhou/root@dev3-138.dev.cn.tlan
3877c091c0 Merge dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug19787
into  dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.1/bug19787
2006-09-14 17:40:01 +00:00
mskold/marty@linux.site
d038e334b4 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2006-09-14 09:29:20 +02:00