mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
49123 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1592 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
a39fe6c128 Bug #27444 DataMemory missing from report in cluster logs 
- error in initial signal length giving uninitialized variable
 2007-03-27 11:12:26 +02:00
tomas@whalegate.ndb.mysql.com
d4982247cf Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-26 20:57:10 +02:00
pekka@clam.(none)
5f061a7e5c Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-ndb 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-25 15:06:19 +02:00
tomas@whalegate.ndb.mysql.com
d5f63f25c5 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 21:50:57 +01:00
antony@ppcg5.local
d4d37f113e WL#2936 
"Server variables for plugins"
  Post review fixes.
 2007-03-23 10:14:46 -07:00
tomas@whalegate.ndb.mysql.com
78dce2dd97 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:17:44 +01:00
tomas@whalegate.ndb.mysql.com
df278bd605 BUG#27254: Single User Mode.Mysql hangs if it tries delete a ndb table 2007-03-23 17:12:06 +01:00
tomas@whalegate.ndb.mysql.com
aadd161d65 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 17:09:10 +01:00
tomas@whalegate.ndb.mysql.com
9af7e2c5a4 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-23 17:08:33 +01:00
tomas@whalegate.ndb.mysql.com
f4fed734c6 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 14:17:08 +01:00
tomas@whalegate.ndb.mysql.com
8823a1a29f correction of merge 2007-03-23 14:16:31 +01:00
tomas@whalegate.ndb.mysql.com
9899df36bd Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-23 14:06:00 +01:00
tomas@whalegate.ndb.mysql.com
05984c7aeb Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
 2007-03-23 08:20:36 +01:00
stewart@willster.(none)
21e9072775 WL#3704 mgmapi timeouts: fix compile warning 2007-03-23 15:25:58 +11:00
stewart@mysql.com[stewart]
7256b93b2e [PATCH] WL#3704 mgmapi timeouts: Fix error insert to NOT_STARTED nodes 
Turns out I broke it.

Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:36:43 +11:00
stewart@mysql.com[stewart]
f40d852fcc [PATCH] WL#3704 mgmapi timeouts: Print full error from mgmd in NdbRestarter errors 
Turns out they can be useful in working out what's going wrong.

Index: ndb-work/storage/ndb/test/src/NdbRestarter.cpp
===================================================================
 2007-03-22 22:36:31 +11:00
stewart@mysql.com[stewart]
4df1bd9c10 [PATCH] WL#3704 mgmapi timeouts: Fix infinite (0) timeout for ndb_logevent_get_next 
Index: ndb-work/storage/ndb/src/mgmapi/ndb_logevent.cpp
===================================================================
 2007-03-22 22:36:19 +11:00
stewart@mysql.com[stewart]
471469a674 [PATCH] WL#3704 mgmapi timeouts: For mgm server, have timeout per operation, not for entire connection (i.e. fix the bug) 
for TransporterRegistry, keep connection to management server alive.


Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:36:07 +11:00
stewart@mysql.com[stewart]
75cff8cd26 [PATCH] WL#3704 mgmapi timeouts: Correct cpc client usage of Socket Input/OutputStream for timeouts 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:35:55 +11:00
stewart@mysql.com[stewart]
2d11a87978 [PATCH] WL#3704 mgmapi timeouts: Add MGMAPI tests to autotest daily run 
Index: ndb-work/storage/ndb/test/run-test/daily-basic-tests.txt
===================================================================
 2007-03-22 22:35:43 +11:00
stewart@mysql.com[stewart]
acb61e810c [PATCH] WL#3704 mgmapi timeouts: update NDBAPI usage of mgmapi for timeouts 
Default timout of 30secs for ConfigRetriever

Default timout of 5sec for use by Transporter (ports etc).

And Ndb_cluster_connection::set_timeout() api for setting timeout from
NDBAPI applications. Should be called before connect. e.g.

c.set_timeout(4200);
c.connect();

Index: ndb-work/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
===================================================================
 2007-03-22 22:35:31 +11:00
stewart@mysql.com[stewart]
420e9ed86e [PATCH] WL#3704 mgmapi timeouts: use timeouts in mgm client 
as side effect - turbo accellerator patch for ndb_mgm - sholud make it quicker... so that 4mhz cpu will seem even faster.

Index: ndb-work/storage/ndb/src/mgmclient/CommandInterpreter.cpp
===================================================================
 2007-03-22 22:35:19 +11:00
stewart@mysql.com[stewart]
c537c27796 [PATCH] WL#3704 mgmapi timeouts: Change to have total timeout for call, not per request 
use portable method, getting milliseconds between calls - Linux would
let us do funky stuff by getting the timeout from select(2). Everywhere
else sucks and doesn't let us do that :(

Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:35:07 +11:00
stewart@mysql.com[stewart]
298719def2 [PATCH] WL#3704 mgmapi timeouts: clarify multiple mgmd connect timeout semantics 
Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:34:55 +11:00
stewart@mysql.com[stewart]
e77a4480ab [PATCH] WL#3704 mgmapi timeouts: consolidate NdbMgmHandle timeouts into one 
Only one timeout value is needed. Also saves 8bytes per NdbMgmHandle :)

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:34:43 +11:00
stewart@mysql.com[stewart]
450d89651c [PATCH] WL#3704 mgmapi timeouts: Test for structured events timeouts (with err injection). 
Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp
===================================================================
 2007-03-22 22:34:31 +11:00
stewart@mysql.com[stewart]
6ce049dcb6 [PATCH] WL#3704 mgmapi timeouts: manipulate some things to get infrastructure for event timeouts 
Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:34:19 +11:00
stewart@mysql.com[stewart]
398d97aae0 [PATCH] WL#3704 mgmapi timeouts: renumber mgmd err insert to not have duplicates. 
Also add an ERROR_codes.txt file for mgmd

Index: ndb-work/storage/ndb/src/mgmsrv/ERROR_codes.txt
===================================================================
 2007-03-22 22:34:08 +11:00
stewart@mysql.com[stewart]
e8121e50e8 [PATCH] WL#3704 mgmapi timeouts: Return sane errors for timeout in mgmapi 
In ndb_mgm_call, add checks for expired timeout in (Input|Output)Stream.
In case of timeout, we set NdbMgmHandle->last_error and return NULL.

In api calls not using ndb_mgm_call (or using it in conjunction with
own IO), they'll need to check for timeouts manually. Macros are provided
to do this.

Add ndb_mgm_disconnect_quiet(h) to disconnect without checking errors
(so we don't clobber NdbMgmHandle->last_error). This helps us provide
the *consistent* semantic that on timeout we leave the NdbMgmHandle
*disconnected*. We check for this in testMgm.

Change CHECK_REPLY in mgmapi to also check for set error in handle->last_error
This will pick up the ETIMEDOUT errors and return them to client (through
returning correct failure code for API call and setting NdbMgmHandle error).
Applications written to MGMAPI before this patch will behave as before,
and even hopefully check get_last_error and report the error back to the
end user!

Adding the last CHECK_TIMEDOUT_RET and delete in ndb_mgm_call() we
slightly change behaviour of mgmapi. Previously, if disconnect
midway through a reply, where there were only optional parameters left,
we'd get a Properties object from ndb_mgm_call() containing NULLs for
the optional parameters, leading to interesting error messages. This
enables the returning of the *real* message and actually improves the API
without breaking compatibility.

ndb_mgm_start_signallog
ndb_mgm_stop_signallog
ndb_mgm_log_signals
ndb_mgm_set_trace
ndb_mgm_insert_error
ndb_mgm_set_int64_parameter [1]
ndb_mgm_set_string_parameter [1]
ndb_mgm_purge_stale_sessions [2]
 - return error code on error during ndb_mgm_call

TODO:
ndb_mgm_report_event [2]

[1] marked for removal, unused.
[2] return codes incorrect in CHECK_HANDLE/CONNECTED. undocumented.


Server side:
 in Services (per session) add macro for injecting timeout error
 (just waiting 10 seconds before continuing... it does work!)

 We inject these errors in a number of critical places - including
 the tricky api functions that don't just use ndb_mgm_call but do
 their own thing (get_config, get_status and friends)

ATRT:
 Expand testMgm to add timout tests for API. Fully automated.
 *THEORETICALLY* timing dependent - an ultra-slow network will
 cause problems and "fake" failures... I welcome other solutions.

 Tests aren't exhaustive, but cover the generics and the tricky bits.
 Also test some calling semantics (incl disconnected on error).

 It is encouraged to add *more* mgmapi tests, not less :)

InputStream:
  Fix where timedout error is set


Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
 2007-03-22 22:33:56 +11:00
stewart@mysql.com[stewart]
64361ee36f [PATCH] WL#3704 mgmapi timeouts: Add bool timeout flag to Streams 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:33:43 +11:00
stewart@mysql.com[stewart]
c2f0a25dc4 [PATCH] WL#3704 mgmapi timeouts: Rename inputstream timeout 
Index: ndb-work/storage/ndb/include/util/InputStream.hpp
===================================================================
 2007-03-22 22:33:31 +11:00
stewart@mysql.com[stewart]
36888199ac [PATCH] WL#3704 mgmapi timeouts: add ndb_mgm_set_timeout(h,ms) 
Add not so neat set_timeout call to make testMgm work

Index: ndb-work/storage/ndb/include/mgmapi/mgmapi.h
===================================================================
 2007-03-22 22:33:19 +11:00
stewart@mysql.com[stewart]
395a24409d [PATCH] WL#3704 mgmapi timeouts: Add ndb_mgmd error injection 
Add error injection either for this connection or for whole server.

Currently nothing for injecting errors into *another* connection... but that's
perhaps getting tricky-dicky for this point in time. Perhaps needed for events
if we don't do anything fancy.

Index: ndb-work/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
===================================================================
 2007-03-22 22:33:07 +11:00
stewart@mysql.com[stewart]
272779e71e [PATCH] WL#3704 mgmapi timeouts: use NdbMgmHandle write_timeout 
Start using the write_timeout we already have in NdbMgmHandle

Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp
===================================================================
 2007-03-22 22:32:54 +11:00
jonas@perch.ndb.mysql.com
05a8790f0b 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-03-22 11:23:47 +01:00
jonas@perch.ndb.mysql.com
4a1c8d296b 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-03-22 11:21:26 +01:00
jonas@perch.ndb.mysql.com
155e3d1139 ndb - 
fix testprg
 2007-03-22 11:20:38 +01:00
jonas@perch.ndb.mysql.com
0e1974d2bf ndb - fix test prg 2007-03-22 11:17:57 +01:00
tomas@whalegate.ndb.mysql.com
753bc96eca Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-22 10:33:26 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
cf64eb21c3 Bug#25446, START BACKUP NOWAIT Reports error and then continues 2007-03-22 15:54:41 +08:00
pekka@clam.(none)
2082a9e35b Merge clam.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug24028 
into  clam.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug24028
 2007-03-22 07:40:04 +01:00
tomas@whalegate.ndb.mysql.com
6e7528bd34 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-22 05:45:17 +01:00
tsmith@quadxeon.mysql.com
54e7bc8daa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/51
 2007-03-22 01:04:39 +01:00
tomas@poseidon.mysql.com
e1cd5c67dc 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-03-21 16:34:23 +01:00
jonas@perch.ndb.mysql.com
ca00e63853 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-03-21 15:37:14 +01:00
jonas@perch.ndb.mysql.com
2cd7ff4e8a 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-03-21 15:36:23 +01:00
jonas@perch.ndb.mysql.com
8a149f2638 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-21 15:35:22 +01:00
tomas@whalegate.ndb.mysql.com
db9a44ce49 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-21 09:29:03 +01:00
tomas@whalegate.ndb.mysql.com
d2f8bd9ae7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-21 09:28:22 +01:00
jonas@perch.ndb.mysql.com
62fde95e08 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-03-21 09:07:55 +01:00
jonas@perch.ndb.mysql.com
762ddadc24 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-03-21 09:06:44 +01:00
jonas@perch.ndb.mysql.com
ec97b008f0 ndb - bug#27286 
make sure master node is sendable, when getting ref::NotMaster
 2007-03-21 08:47:54 +01:00
tomas@whalegate.ndb.mysql.com
38ac10df54 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-03-21 08:23:15 +01:00
tomas@whalegate.ndb.mysql.com
3ab996f18f correct event buffer status reporting 2007-03-21 08:22:36 +01:00
tsmith@quadxeon.mysql.com
7018d9c5aa Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/mar20/maint/51
 2007-03-20 21:12:46 +01:00
kent@kent-amd64.(none)
a149769b2d Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-20 17:58:30 +01:00
tomas@whalegate.ndb.mysql.com
3f16977b32 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 17:08:23 +01:00
tomas@whalegate.ndb.mysql.com
7bd5241cb4 enabled test case 
+ some fixes to do the enable
 2007-03-20 17:07:53 +01:00
jonas@perch.ndb.mysql.com
8c3751209c 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-03-20 16:36:31 +01:00
jonas@perch.ndb.mysql.com
42b3e0a5af Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-20 16:32:11 +01:00
tomas@whalegate.ndb.mysql.com
64b9bda21f BUG#24363 If the table structure has been changed, the default action about the restore will fail. 
- correction of patch, original patch will segfault for print option
 2007-03-20 11:11:08 +01:00
tomas@poseidon.
0312d1bf91 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2007-03-20 08:57:34 +01:00
gni/root@dev3-221.dev.cn.tlan
61dd58beb3 BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still table in it. And it gives the cofusing error message. 2007-03-20 10:36:20 +08:00
kostja@bodhi.local
bdb10baec1 Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  bodhi.local:/opt/local/work/mysql-5.1-runtime
 2007-03-20 00:42:11 +03:00
jonas@perch.ndb.mysql.com
229ee6d4f1 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-03-19 14:55:13 +01:00
jonas@perch.ndb.mysql.com
886e11736b ndb - test_event 
Fix compile error with gcc4
 2007-03-19 14:51:17 +01:00
jonas@perch.ndb.mysql.com
6856693904 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-03-19 12:39:03 +01:00
jonas@perch.ndb.mysql.com
09e403aa9e ndb - bug#20185 
Fix race in testprg...causing random TC crashes
 2007-03-19 12:31:23 +01:00
jonas@perch.ndb.mysql.com
582312fd34 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-03-19 11:15:05 +01:00
jonas@perch.ndb.mysql.com
bdb70f7b43 ndb - autotest 
increase some timeouts...
 2007-03-19 11:13:10 +01:00
tomas@poseidon.
12fd06a6cb Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  poseidon.:/home/tomas/mysql-5.1-new-ndb
 2007-03-19 10:54:47 +01:00
jonas@perch.ndb.mysql.com
40c3797ef0 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-03-16 11:13:01 +01:00
jonas@perch.ndb.mysql.com
a8a220534c 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-03-16 11:12:15 +01:00
jonas@perch.ndb.mysql.com
f161857d3e ndb - bug#27203 
Allow readTablePk to stumble on scan+deleted tuple,
      reporting no-match instead of crash (in case scan is lock-owner)
 2007-03-16 10:58:24 +01:00
kostja@bodhi.local
7d84ef0e11 Bug#26765 "typo when running mysql-test-run" 
Fix a typo (togheter -> together)
 2007-03-15 23:17:44 +03:00
hartmut@hartmut-desktop.buero.foebud.org
d2986bff2e Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb 
into  mysql.com:/home/hartmut/projects/mysql/dev/bug-trees/mysql-5.1-bug25933
 2007-03-15 13:52:25 +01:00
jonas@perch.ndb.mysql.com
85220e3940 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-03-15 13:37:04 +01:00
hartmut@mysql.com/hartmut-desktop.buero.foebud.org
4c9f4a006f added missing prototype implementations (bug #25933) 2007-03-15 13:35:49 +01:00
jonas@perch.ndb.mysql.com
1bf8202fce ndb - bug#27169 
Fix bug in SUMA::resend_bucket which could cause mysqld to crash
 2007-03-15 13:30:42 +01:00
jonas@perch.ndb.mysql.com
f8483eccc3 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-03-15 11:06:57 +01:00
jonas@perch.ndb.mysql.com
1c203fcc04 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-15 11:06:01 +01:00
jonas@perch.ndb.mysql.com
14de245543 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-03-15 07:16:44 +01:00
jonas@perch.ndb.mysql.com
1fa2a64778 ndb - 
fix test_event -n EventOperationApplier
 2007-03-15 07:08:15 +01:00
jonas@perch.ndb.mysql.com
a7714519a7 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-03-14 15:41:24 +01:00
jonas@perch.ndb.mysql.com
72bd367013 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-03-14 15:40:06 +01:00
jonas@perch.ndb.mysql.com
3b21f00f87 ndb - bug#27005 
Handle API failure during resend
    API failure could cause release of table object, which will make resend crash
      when dereferencing table object
      
    Solution, use table_id+hash+schemaversion instead of *raw* pointer in resend
 2007-03-14 15:37:47 +01:00
kent@kent-amd64.(none)
ac91a4a89f Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-14 14:37:50 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
1bcac85f04 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/mysql-5.1-new-ndb-bj
 2007-03-14 18:48:51 +08:00
jonas@perch.ndb.mysql.com
f2465cf677 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-03-14 11:23:58 +01:00
jonas@perch.ndb.mysql.com
820901f928 ndb - bug#27087 
Make sure not to handle API_FAILREQ if it's already handled
 2007-03-14 11:22:11 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9b77ac20a5 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/mysql-5.1-new-ndb-bj.merge
 2007-03-14 10:16:24 +08:00
jonas@perch.ndb.mysql.com
ac52f24ece 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-03-13 21:04:28 +01:00
jonas@perch.ndb.mysql.com
5ea42fb2ea ndb - bug#27102 
Make sure head after undo execute does not point to last page of file
  As this will confuse next write to group
 2007-03-13 21:03:34 +01:00
jonas@perch.ndb.mysql.com
023ce289b6 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-03-13 13:56:51 +01:00
jonas@perch.ndb.mysql.com
4a27e9adb9 ndb - bug#27003 
merge to 5.1, adopt testprg to optimized node recovery
 2007-03-13 12:38:47 +01:00
jonas@perch.ndb.mysql.com
620731060f Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-03-13 12:07:33 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
8b049838bf Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb.test 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.test
 2007-03-13 18:18:17 +08:00
lzhou/zhl@dev3-63.(none)
9fb5e5d08b Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug26307
 2007-03-13 10:13:04 +00:00
knielsen@ymer.(none)
4fe26832e4 Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb 
into  ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
 2007-03-12 08:42:59 +01:00
tomas@poseidon.mysql.com
175a7e9e86 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1
 2007-03-09 20:44:44 +07:00
tomas@poseidon.mysql.com
6f5ac3c03a Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-09 20:38:10 +07:00
tomas@poseidon.mysql.com
a8cd78dd05 Bug #26825 MySQL Server Crashes in high load 
Bug #26997  	mysqld segfault when in single user mode
 2007-03-09 20:29:46 +07:00
tomas@poseidon.mysql.com
87b8cf843e Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 18:18:52 +07:00
tomas@poseidon.mysql.com
7e32a4b86b Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1
 2007-03-09 18:10:55 +07:00
jonas@perch.ndb.mysql.com
5a6952b8c5 Merge perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.0-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/tmp/mysql-5.1-telco-gca
 2007-03-09 11:50:32 +01:00
gni/root@dev3-221.dev.cn.tlan
afd6dbbc57 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-bug25992
 2007-03-09 18:04:34 +08:00
tomas@poseidon.mysql.com
451a8b7772 BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), ndbd nodes are crashed 2007-03-09 10:21:11 +07:00
tomas@poseidon.mysql.com
f4e0bc78dd Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 01:01:20 +07:00
tomas@poseidon.mysql.com
1d13b0e2e8 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-09 00:49:30 +07:00
tsmith@bk-internal.mysql.com
8539d9a7bd The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
tsmith@bk-internal.mysql.com
bb273143fc Merge bk-internal.mysql.com:/data0/bk/mysql-5.1 
into  bk-internal.mysql.com:/data0/bk/tsmith-tmp/mysql-5.2
 2007-03-08 17:55:20 +01:00
gni/root@dev3-221.dev.cn.tlan
f1b05f294b BUG#25743 If undo_buffer_size (for LG) greater than the inital shared memory (default 20M), 
ndbd nodes are crashed
 2007-03-08 17:47:13 +08:00
tomas@poseidon.mysql.com
e4eb1c0087 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 15:57:33 +07:00
tomas@poseidon.mysql.com
12bf7fbee5 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 10:41:22 +07:00
tomas@poseidon.mysql.com
8370b2c5e0 Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-08 08:39:49 +07:00
tomas@poseidon.mysql.com
f81ff454f0 new apply_status table test adoption 
new apply_status table ndb_restore adoption
 2007-03-08 08:22:27 +07:00
tomas@poseidon.mysql.com
7c6b3d6ca7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-08 00:27:54 +07:00
tomas@poseidon.mysql.com
da38893f6d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-07 20:06:23 +07:00
tomas@poseidon.mysql.com
3d882032e3 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-user 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user
 2007-03-07 15:31:11 +07:00
tomas@poseidon.mysql.com
97ceb61fff corrected manual merge 2007-03-07 14:20:37 +07:00
tomas@poseidon.mysql.com
bd49cdd273 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca-ndb_restore 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca-ndb_restore
 2007-03-07 13:44:54 +07:00
tomas@poseidon.mysql.com
05afa6e689 Merge poseidon.mysql.com:/home/tomas/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-03-07 00:31:12 +07:00
gni/root@dev3-221.dev.cn.tlan
e851d78860 BUG#25992 Data nodes died during creating many tables based on different tablespaces. 2007-03-05 11:25:44 +08:00
lzhou/zhl@dev3-63.(none)
be4db4993b BUG#26307 correct inconsistant jam() and ljam() use in DBTUP source files. 2007-03-02 18:45:09 +00:00
jonas@perch.ndb.mysql.com
53e7320408 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-02 19:11:56 +01:00
jonas@eel.(none)
6a52626da9 ndb - bug#15632 
arg...also fix starting node...(version 6)
 2007-03-02 19:08:58 +01:00
jonas@eel.(none)
e8cc3c4f1f ndb - bug#15632 
fix testNodeRestart -n Bug15632
  handle version > 5
 2007-03-02 18:47:30 +01:00
jonas@perch.ndb.mysql.com
0ec5020ebd Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-03-02 11:52:16 +01:00
jonas@perch.ndb.mysql.com
f05e5e8c4e ndb - 
fix printout
  crashes testSystemRestart -n SR_UNDO
 2007-03-02 11:48:14 +01:00
jonas@perch.ndb.mysql.com
38814b22dd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-03-02 11:41:21 +01:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2248cd3d3e bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected 
when merge from 5.0 to 5.1, update a function call in testScanFilter.cpp 
beacuase the function's definition is changed from 5.0 to 5.1
 2007-03-02 11:03:16 +08:00
tomas@poseidon.mysql.com
60ab46bd87 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-02 09:13:00 +07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
e1a90408db bug#24568, NdbScanFilter NAND/NOR operations sometimes do not work as expected, 
add a new file in 5.0 and rename it in 5.1 because the directory of ndb is changed from 5.0 to 5.1
 2007-03-02 09:41:47 +08:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
2dc3fbf925 Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.0/bug24568-5.0-ndb-bj 
into  dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/bug24568-5.1-new-ndb-bj
 2007-03-01 17:43:14 +08:00
tomas@poseidon.mysql.com
3838925f04 Bug #26741 ndb_restore with only print_data seg faults 
- only creat systable if conencted to ndb
 2007-03-01 11:07:24 +07:00
tomas@poseidon.mysql.com
3c1af79c61 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-03-01 08:45:26 +07:00
lars/lthalmann@dl145k.mysql.com
504b4d2dfb Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-02-28 22:32:44 +01:00
tsmith/mysqldev@bk-internal.mysql.com
b887bfe1a4 Update version to 5.2.0-alpha - new 5.2 tree 2007-02-28 19:37:31 +01:00
monty@mysql.com/narttu.mysql.fi
cfef5d04b3 Remove compiler warnings 2007-02-27 19:31:49 +02:00
tomas@poseidon.mysql.com
2126b85510 corrected manual merge 2007-02-26 23:52:11 +07:00
tomas@poseidon.mysql.com
9f586e3e61 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
 2007-02-26 23:50:02 +07:00
lars/lthalmann@dl145j.mysql.com
e1867c3156 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-02-25 00:12:14 +01:00
lars/lthalmann@dl145h.mysql.com
8b39189ee4 Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
 2007-02-24 11:52:08 +01:00
mats@romeo.(none)
54b04ff5c8 BUG#19033 (RBR: slave does not handle schema changes correctly): 
Post-merge fixes.
 2007-02-23 18:54:26 +01:00
monty@mysql.com/narttu.mysql.fi
f0ae3ce9b9 Fixed compiler warnings 
Fixed compile-pentium64 scripts
Fixed wrong estimate of update_with_key_prefix in sql-bench
Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1
Fixed unsafe define of uint4korr()
Fixed that --extern works with mysql-test-run.pl
Small trivial cleanups
This also fixes a bug in counting number of rows that are updated when we have many simultanous queries
Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc
Split handle_one_connection() into reusable sub functions.
Split create_new_thread() into reusable sub functions.
Added thread_scheduler; Preliminary interface code for future thread_handling code.

Use 'my_thread_id' for internal thread id's
Make thr_alarm_kill() to depend on thread_id instead of thread
Make thr_abort_locks_for_thread() depend on thread_id instead of thread
In store_globals(), set my_thread_var->id to be thd->thread_id.
Use my_thread_var->id as basis for my_thread_name()
The above changes makes the connection we have between THD and threads more soft.

Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions
Fixed compiler warnings
Fixed core dumps when running with --debug
Removed setting of signal masks (was never used)
Made event code call pthread_exit() (portability fix)
Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called.
Made handling of thread_id and thd->variables.pseudo_thread_id uniform.
Removed one common 'not freed memory' warning from mysqltest
Fixed a couple of usage of not initialized warnings (unlikely cases)
Suppress compiler warnings from bdb and (for the moment) warnings from ndb
 2007-02-23 13:13:55 +02:00
pekka@clam.ndb.mysql.com/clam.(none)
f668fabb61 ndb - 5.1.16 uint64 align for ndb_restore 2007-02-23 04:21:39 +01:00
pekka@orca.ndb.mysql.com
356004cc3c Merge clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb 
into  clam.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-rel
 2007-02-22 15:28:45 +01:00
jonas@perch.ndb.mysql.com
7766171b05 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-22 15:05:49 +01:00
jonas@eel.(none)
6d9d1f9737 ndb - bug#26481 - fix of bug fix 
Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...START_RECREQ is not enough
 2007-02-22 15:02:48 +01:00
pekka@clam.ndb.mysql.com/orca.ndb.mysql.com
0ea380fd2b ndb - rel5.1.16 NdbRecAttr print of blob length assumed uint64 aligned buffer 2007-02-22 12:38:44 +01:00
jonas@perch.ndb.mysql.com
636db0bf85 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-02-21 18:07:48 +01:00
jonas@perch.ndb.mysql.com
e8cd384de5 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-21 18:06:06 +01:00
jonas@perch.ndb.mysql.com
d424ffbd4e Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-21 18:03:17 +01:00
jonas@eel.(none)
53fe7d831c Merge localhost:/home/jonas/src/51-work 
into  eel.(none):/home/jonas/src/51-work
 2007-02-21 16:44:39 +01:00
jonas@eel.(none)
5fd96a4526 ndb - bug#26514 
fix overflow that could occur when have either lots of dd-data or very high dd-parallelism
 2007-02-21 16:33:16 +01:00
jonas@eel.(none)
be0798a0c3 ndb - bug#26487 
fix bug in extent/page allocation when *using* >1gb datafiles
 2007-02-21 14:40:15 +01:00
tomas@poseidon.mysql.com
dd3239821f fix c++ syntac in c file 2007-02-21 14:26:47 +07:00
tomas@poseidon.mysql.com
6cbc6d91f9 Bug #26490 duplicate cluster error code 
- fixed error code
- added test program run in mysql-test-run bk version
 2007-02-21 11:41:22 +07:00
jonas@eel.(none)
5059ce2143 ndb - 
write testcase for bug#26450...
  no solution however...
 2007-02-20 20:33:53 +01:00
knielsen@ymer.(none)
6db8fef5d3 A few minor cleanups for recent AbortOption behaviour change. 2007-02-20 09:52:18 +01:00
jonas@perch.ndb.mysql.com
5d37bbee56 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-20 01:00:18 +01:00
jonas@perch.ndb.mysql.com
1d99e609ed Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-20 00:58:25 +01:00
jonas@perch.ndb.mysql.com
9bc3503489 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 22:56:15 +01:00
jonas@perch.ndb.mysql.com
f2e2e7a6e7 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-19 22:53:17 +01:00
jonas@perch.ndb.mysql.com
6c54eccda2 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
 2007-02-19 21:19:21 +01:00
jonas@perch.ndb.mysql.com
20c8b292e7 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-19 20:34:48 +01:00
jonas@perch.ndb.mysql.com
1cfd066e90 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-19 20:21:28 +01:00
jonas@perch.ndb.mysql.com
44fa3eaaf6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-18 00:23:08 +01:00
jonas@perch.ndb.mysql.com
4d80c3f639 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-17 23:57:09 +01:00
jonas@perch.ndb.mysql.com
44f1c6249b Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 21:44:39 +01:00
jonas@eel.(none)
f65af74adc Merge localhost:/home/jonas/src/51-work 
into  eel.(none):/home/jonas/src/51-work
 2007-02-16 21:39:20 +01:00
jonas@eel.(none)
c46900c1a9 ndb - atrt minor fixes 2007-02-16 21:09:38 +01:00
jonas@perch.ndb.mysql.com
10153653b2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 18:25:10 +01:00
jonas@perch.ndb.mysql.com
3d04728eea Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-16 18:23:54 +01:00
jonas@perch.ndb.mysql.com
62e52c4998 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 18:16:22 +01:00
jonas@perch.ndb.mysql.com
d1026838f5 Merge perch.ndb.mysql.com:/home/jonas/src/50-work 
into  perch.ndb.mysql.com:/home/jonas/src/51-work
 2007-02-16 18:14:41 +01:00
jonas@perch.ndb.mysql.com
80fe0fe445 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-16 01:53:29 +01:00
jonas@eel.(none)
685423e587 ndb - autotest 
increase timeout on slow test
 2007-02-16 01:40:50 +01:00
jonas@eel.(none)
b030cc5516 ndb autotest - 
Fix testcase so that it does not leak tables...causing subsequent errors
 2007-02-16 01:36:22 +01:00
jonas@perch.ndb.mysql.com
af1e269165 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-02-15 23:17:51 +01:00
jonas@perch.ndb.mysql.com
f7ea83d6e5 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-15 23:15:40 +01:00
jonas@eel.(none)
b95714e138 ndb - new atrt 
Fix bug when restarting cluster after failure
      (fs was not cleared)
    Fix cosmetic bug that made rsync be run several times when gathering result
 2007-02-15 23:10:32 +01:00
jonas@eel.(none)
1d54870364 ndb - 
fix ao_ignore behavior change in hugo
  (affecting testOperations & testTransactions)
 2007-02-15 18:39:17 +01:00
gni/root@dev3-221.dev.cn.tlan
8b4e1a2f3d 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-bug19378
 2007-02-15 17:51:18 +08:00
gni/root@dev3-221.dev.cn.tlan
7751f965da 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
 2007-02-15 17:20:05 +08:00
gni/root@dev3-221.dev.cn.tlan
d2a0c95aef 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
 2007-02-15 16:27:21 +08:00
gni/root@dev3-221.dev.cn.tlan
525801e31b 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-bug24363
 2007-02-15 13:44:01 +08:00
tomas@poseidon.mysql.com
7da5b1ecba 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-02-15 00:21:46 +07:00
tomas@poseidon.mysql.com
8a146f8461 corrected manual merge 2007-02-14 20:17:14 +07:00
stewart@willster.(none)
dcb2c39aa7 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-02-14 21:44:28 +11:00
tomas@poseidon.mysql.com
91c36268c7 Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 15:31:00 +07:00
stewart@willster.(none)
6aba20c2d6 Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge
 2007-02-14 17:10:38 +11:00
stewart@willster.(none)
143f3e7964 BUG#20121 missing err msg for ENOSPC 
getting BACKUP_FRAGMENT_REF in LQH from BACKUP would bail on
ndbrequire(false) instead of having good error message.

Can re-use error code from BACKUP as it's a FsRef error code,
which is NDBD_EXIT... except when it isn't.
 2007-02-14 16:49:40 +11:00
stewart@willster.(none)
6358a0f48c Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work 
into  willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
 2007-02-14 16:37:40 +11:00
tomas@poseidon.mysql.com
e865b5950f Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 11:55:31 +07:00
tomas@poseidon.mysql.com
18d227b1b0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-14 10:18:02 +07:00
jonas@eel.(none)
0657f1b58d Merge localhost:/home/jonas/src/51-work 
into  eel.(none):/home/jonas/src/51-work
 2007-02-13 22:03:44 +01:00
ndbdev@ndbmaster.mysql.com
3685960425 adopt to changes in load_defaults 2007-02-13 14:32:07 +01:00
jonas@perch.ndb.mysql.com
fe0d7ee45d 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-02-13 02:56:35 +01:00
jonas@perch.ndb.mysql.com
7083110de6 Merge perch.ndb.mysql.com:/home/jonas/src/51-work 
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
 2007-02-13 02:54:51 +01:00
jonas@perch.ndb.mysql.com
fc94ac8a10 ndb - new atrt 2007-02-13 02:38:54 +01:00
tomas@poseidon.mysql.com
9545bef37d Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-09 20:31:52 +07:00
tsmith@siva.hindu.god
498756195a Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-02-08 16:02:58 -07:00
tomas@poseidon.mysql.com
18f63370aa Bug #24000 ndb_config.cpp has the wrong name ndb_condig.cpp in source distro 2007-02-08 13:40:05 +07:00
mskold/marty@linux.site
8dd443f986 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 11:44:41 +01:00
mskold/marty@linux.site
fd0232b226 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-07 11:40:43 +01:00
mskold/marty@linux.site
5d35ff3da1 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-07 09:37:18 +01:00
mskold/marty@linux.site
270fd100b7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-07 09:32:34 +01:00
mskold/marty@linux.site
6aee9eedf7 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
 2007-02-06 23:48:53 +01:00
mskold/marty@linux.site
b13e5b8ee9 Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0 
into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
 2007-02-06 23:42:24 +01:00
msvensson@neptunus.(none)
e4001b3b5a Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
 2007-02-06 15:46:17 +01:00
gni/root@dev3-221.dev.cn.tlan
3f5cac54c2 BUG#19378 Job Buffer Full error appears for too large MaxNoOfTables 2007-02-06 20:00:00 +08:00
tomas@poseidon.mysql.com
54bd795f12 Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-cga 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-06 12:45:42 +07:00
tomas@poseidon.mysql.com
a8f0edea67 ndb: remove WAITFOR_RESPONSE_TIMEOUT printout 
- to get cleaner error log in debug mode
 2007-02-06 11:57:56 +07:00
jonas@eel.(none)
743909180f ndb - 
remove debug printouts
 2007-02-06 03:54:25 +01:00
jonas@perch.ndb.mysql.com
9364181baf 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-02-05 21:50:39 +01:00
jonas@eel.(none)
3edab3e4c8 ndb - some more hugo abort option fix 2007-02-05 21:38:16 +01:00
jonas@eel.(none)
35bfea9466 ndb - 
Add abort option to lots of Hugo code, 
as it assumes it and default value has changed
 2007-02-05 20:28:11 +01:00
jonas@eel.(none)
8619dfc222 ndb - bug#25801 
- improve error message if starting wo/ enough REDO
  - decrease likelyhood of trying to start too early
 2007-02-05 19:47:19 +01:00
lzhou/zhl@dev3-63.(none)
6039446293 Merge lzhou@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/mysql-5.1/bug21296-5.1.12
 2007-02-05 15:44:59 +00:00
gni/root@dev3-221.dev.cn.tlan
53f7d72a5b BUG#24363 If the table structure has been changed, the default action about the restore will fail. 
You can skip the table structure check with --skip-table-check (-s) option.
 2007-02-05 16:48:08 +08:00
tomas@poseidon.mysql.com
aad58e2613 corrected merge error 2007-02-05 12:51:45 +07:00
tomas@poseidon.mysql.com
3c265e5944 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
 2007-02-05 12:19:24 +07:00
jonas@eel.(none)
ef38f9b780 ndb - bug#25984 - more than 7 failed node restart can cause cluster failure 
new behaviour is as follows:
1) node is refused to start, and should fail with message in error log that it must be restarted --initial
2) if cluster failure in this situation, node must also be restarted --intial
   if not SR will fail, with this message
 2007-02-02 17:07:15 +01:00
jonas@eel.(none)
9f69d9ffde Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb 
into  eel.(none):/home/jonas/src/51-work
 2007-02-02 16:21:42 +01:00
jonas@eel.(none)
4b965407d2 ndb - test prg 
fix failure during start
 2007-02-02 16:14:48 +01:00
lzhou/zhl@dev3-63.(none)
224900565c Merge dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb-bj 
into  dev3-63.(none):/home/zhl/mysql/tree-merge/5.1/mysql-5.1-new-ndb
 2007-02-01 17:34:20 +00:00
lzhou/zhl@dev3-63.(none)
956636767e BUG#22025 Return correct error message when transporter error occured. Modify content of message structure of last patch. 2007-02-01 14:37:43 +00:00
stewart@willster.(none)
71097eff45 BUG#23571 missing jamEntry() after EXECUTE_DIRECT in lqh 
add the jamEntry()
 2007-02-01 17:19:19 +11:00
cmiller@zippy.cornsilk.net
522d6fb0cc Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-01-31 16:24:28 -05:00
tomas@poseidon.mysql.com
1ce3dc9636 Bug#25239 Out of memory problem can cause crash in SUMA 2007-01-31 13:01:03 +07:00
jonas@perch.ndb.mysql.com
0a32761857 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-30 19:45:44 +01:00
jonas@perch.ndb.mysql.com
08d5217056 ndb - interface change of handling of abort option 
1) move AbortOption from NdbTransaction to NdbOperation

2) let each operation have a "default" abort option dependant on
   operation type

   - read - AO_IgnoreError
   - dml - AbortOnError
   - scan take over - AbortOnError

3) Changed default value to execute() from AbortOnError to DefaultAbortOption, which does not change the operations abort-option.

   Another value to execute(AO) is equivalent to setting AO on each operation before calling execute

4) execute() does _only_ return -1 if transaction has been aborted
   otherwise, you need to check each operation for error code
 2007-01-30 19:45:14 +01:00
jonas@perch.ndb.mysql.com
60d263b92d 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-30 19:34:49 +01:00
jonas@perch.ndb.mysql.com
4ffcd999de 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-30 19:33:33 +01:00
jonas@perch.ndb.mysql.com
7d54ea6b49 ndb - 
remove copy/paste method in NdbIndexOperation
 2007-01-30 19:28:32 +01:00
jonas@perch.ndb.mysql.com
3a3ed75655 ndb - minor style fixes 2007-01-30 19:26:40 +01:00
tomas@poseidon.mysql.com
bfb0614175 valgrind leak 
- no injected events if operation is not connected
- remove extra valgrind checks
 2007-01-30 15:43:55 +07:00
Justin.He/justin.he@dev3-240.dev.cn.tlan
9755609b7b Bug#23546, Cluster configured without any arbitration 2007-01-30 13:05:40 +08:00
jonas@perch.ndb.mysql.com
0d1f39202d ndb - 
two small fixes for TC
    1) use static syntax
    2) fix attlen handling in unique index
 2007-01-30 04:14:07 +01:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6 after merge fixes 
Removed
 2007-01-29 16:13:18 +02:00
monty@narttu.mysql.fi
bb464613ce Merge bk-internal.mysql.com:/home/bk/mysql-5.1 
into  mysql.com:/home/my/mysql-5.1
 2007-01-29 01:57:07 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72 After merge fixes 
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
 2007-01-29 01:47:35 +02:00
jonas@perch.ndb.mysql.com
3f2a9eeba2 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-28 22:03:42 +01:00
jonas@perch.ndb.mysql.com
6b738220d9 ndb - Fix so that node version is recomputed at node failure 2007-01-28 21:56:17 +01:00
monty@narttu.mysql.fi
8a80e36ac3 Merge mysql.com:/home/my/mysql-5.0 
into  mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
 2007-01-27 03:46:45 +02:00
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