mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
27130 commits 2781 branches 343 tags 1.6 GiB
Commit graph

2473 commits

Author SHA1 Message Date
joreland@mysql.com
faff193517 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-21 09:23:42 +02:00
joreland@mysql.com
a5c6ab3c22 merge 2005-07-21 09:10:44 +02:00
joreland@mysql.com
7482389227 Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-20 16:10:41 +02:00
joreland@mysql.com
1ca398f6b9 merge 2005-07-20 16:09:22 +02:00
joreland@mysql.com
5317b349b0 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-20 14:27:44 +02:00
joreland@mysql.com
96272a6c52 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-20 14:25:46 +02:00
joreland@mysql.com
07aab2139b Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-4.1-push
 2005-07-20 13:32:20 +02:00
joreland@mysql.com
b2486b81df Merge mysql.com:/home/jonas/src/mysql-5.0 
into  mysql.com:/home/jonas/src/mysql-5.0-push
 2005-07-20 13:29:45 +02:00
joreland@mysql.com
1e8380df96 Merge mysql.com:/home/jonas/src/mysql-4.1 
into  mysql.com:/home/jonas/src/mysql-5.0
 2005-07-20 13:25:52 +02:00
joreland@mysql.com
bb73ba0902 bug#11942 - ndb backup 
fix error code to avoid clash with 5.0/5.1
 2005-07-20 13:21:49 +02:00
joreland@mysql.com
884559e3bf bug#11942 - ndb backup with parallell DDL 
add testcase to autotest
 2005-07-20 12:39:45 +02:00
joreland@mysql.com
9f707b6734 bug#11942 2005-07-20 11:48:48 +02:00
pekka@mysql.com
e0c23a34d9 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-ndb
 2005-07-20 10:37:17 +02:00
jimw@mysql.com
80c1c6b33f Merge mysql.com:/home/jimw/my/mysql-4.1-clean 
into  mysql.com:/home/jimw/my/mysql-5.0-clean
 2005-07-19 11:05:49 -07:00
tulin@dl145b.mysql.com
c9abae2ce2 printout of cluster config to use same tokens as documentation 2005-07-19 16:34:56 +02:00
tulin@dl145b.mysql.com
2f01676b37 ConfigInfo.cpp: 
BUG#12028, cannot use default section for hostname in cluster config
  made clearer error message
 2005-07-19 15:25:55 +02:00
tulin@dl145b.mysql.com
74438e6683 BUG#12028, cannot use default value for HostName in cluster config 
+ added switch --print-full-config
+ removed unused REP configuration
 2005-07-19 14:33:38 +02:00
pekka@mysql.com
360152c888 ndb - DICT minor 2005-07-19 10:49:45 +02:00
pekka@mysql.com
8cb9f0ef49 ndb - bug#11355 some fixes to index drop etc 2005-07-19 04:01:46 +02:00
pekka@mysql.com
c7d9eebed7 Merge mysql.com:/space/pekka/ndb/version/my50 
into  mysql.com:/space/pekka/ndb/version/my50-ndb
 2005-07-17 11:49:35 +02:00
pem@mysql.com
10db4d030f Made .c files compile with a C compiler. 2005-07-15 17:19:25 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f Merge 2005-07-15 14:13:23 +02:00
tomas@poseidon.ndb.mysql.com
f97c11fe03 minor type fixes to prev patch 2005-07-15 13:57:21 +02:00
tomas@poseidon.ndb.mysql.com
cd590a6a02 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-release 
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-new
 2005-07-15 13:32:08 +02:00
tomas@poseidon.ndb.mysql.com
ca75369663 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener 
+ added close of some fd's
      + debug prints
 2005-07-15 12:40:20 +02:00
tomas@poseidon.ndb.mysql.com
c9e320019b Bug #11132, reverted bug-fix, it introduces another bug. Ndbd's may get the same nodeid 
In 4.1 the connection to the management server _must_ stay, that is how we
ensure that the nodeids are reserved correctly
 2005-07-15 12:35:26 +02:00
tomas@poseidon.ndb.mysql.com
da6d150453 BUG#11596 (partial fix), IP addresses not shown in ndb_mgm SHOW command on second ndb_mgmd (or on ndb_mgmd restart) 2005-07-15 10:44:54 +02:00
tomas@poseidon.ndb.mysql.com
fd884fdd0a merge, adopted structured event interface to filter out "PING" events c.f. BUG#11898, ndb_mgmd does not release resources 2005-07-15 02:31:13 +02:00
tomas@poseidon.ndb.mysql.com
d97cccd32b Merge 2005-07-15 01:41:59 +02:00
tomas@poseidon.ndb.mysql.com
ec52d680d2 misc (memleak) fixes: 
added using ndb_end and showing mem allocation stat at exit
    added init of variable
    added destruction of LocalConfig to still memleak
    added delete of theFacade on exit
    stopSessions(true) on socket server to ensure destuction of threads
    added destruction of arbit manager thread
    added true option to stopSessions in transporter facade to ensure destructions of threads
 2005-07-14 18:08:01 +02:00
tomas@poseidon.ndb.mysql.com
8afeb337f0 BUG#11898 ndb_mgmd not releasing resources, added "ping" on add_listener 
+ added close of some fd's
    + debug prints
 2005-07-14 18:04:44 +02:00
tomas@poseidon.ndb.mysql.com
9be420ee10 stilled mem leak in usage on getVersionString 
added __LINE__ so systemErrorLab for better error printout
 2005-07-14 18:02:33 +02:00
tomas@poseidon.ndb.mysql.com
96a80fd220 added debug prints 2005-07-14 18:02:32 +02:00
joreland@mysql.com
22a0df05f1 bug#9961 more printouts 2005-07-12 16:34:09 +02:00
joreland@mysql.com
dadfd054d0 ndb - gcp stop bug#9961 more printouts 2005-07-12 16:31:15 +02:00
pekka@mysql.com
13a20392d2 ndb - move sp to >5.0 2005-07-11 13:19:53 +02:00
joreland@mysql.com
7efa714fef bug#9961 - ndb - gcp stop 
even more printouts...
 2005-07-07 10:33:17 +02:00
stewart@mysql.com
11ec718ef1 BUG#11516 ndb_mgmd debug core on cluster shutdown with failed data nodes 
Fix closing of sessions on mgm server shutdown.
 2005-07-07 15:19:56 +10:00
joreland@mysql.com
7b5db3f0fe bug#9961 - ndb gcp stop 
add lots of printouts when stop is detected
 2005-07-06 11:16:36 +02:00
joreland@mysql.com
fa11c5bf10 ndb - 
fix bug in MemoryChannel
 2005-07-04 10:18:36 +02:00
joreland@mysql.com
5ec5cde271 bug#11133 - ndb write handling 
fix handling of write's in lock queue
  add test case
  add support for pkWrite+async exec in HugoOperations
 2005-07-01 09:57:48 +02:00
stewart@mysql.com
d09df616e5 BUG#10950 Occational 'Error in mgm protocol parser' error on mysqld startup 
Display the (more commonly accurate) message that the mgm server closed our connection
and that we'll retry connecting to it.
 2005-06-30 23:22:58 +10:00
marty@linux.site
e4aedcc2c1 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into  linux.site:/home/marty/MySQL/mysql-5.0
 2005-06-30 12:20:52 +02:00
joreland@mysql.com
544a8acad2 ndb autotest - merge jebs fixes 2005-06-30 10:10:12 +02:00
msvensson@neptunus.(none)
e929e55fb6 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-22 20:59:34 +02:00
mskold@mysql.com
09d17627fd Made upgrade compatibility in 5.0 range to latest build version 2005-06-22 11:34:04 +02:00
mskold@mysql.com
c8398bcd2b Made upgrade compatibility in 4.1 range to latest build version 2005-06-22 11:18:40 +02:00
msvensson@neptunus.(none)
ddeaf342a7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/mysql-4.1
 2005-06-21 14:24:13 +02:00
msvensson@neptunus.(none)
73c1578f15 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 
into neptunus.(none):/home/msvensson/mysql/bug10365
 2005-06-20 13:08:45 +02:00
stewart@mysql.com
c4066adafd BUG#11377 Building cluster in 4.1 BK tree fails with GCC4.0 2005-06-20 15:18:53 +10:00
serg@serg.mylan
6db4760677 Merge bk-internal:/home/bk/mysql-5.0 
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
 2005-06-16 15:33:48 +02:00
serg@serg.mylan
e9b47ad3c7 merged 2005-06-16 14:35:15 +02:00
stewart@mysql.com
ec9eae0834 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main 
into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132
 2005-06-16 21:19:40 +10:00
stewart@mysql.com
a4028c0f8a Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main 
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
 2005-06-16 21:11:08 +10:00
stewart@mysql.com
36979d195d BUG#11132 Connections stuck in CLOSE_WAIT 
This fixes the problem in 5.0 in the correct way.

The previous patch (for 4.1) is only valid for 4.1 and is done at the right time
for 4.1.
 2005-06-16 18:17:44 +10:00
stewart@mysql.com
ec26af487d fix debug string in TR::report_disconnect 2005-06-16 14:21:48 +10:00
stewart@mysql.com
a9338b4edb BUG#11132 Connections stuck in CLOSE_WAIT 
The 4.1 fix is not valid for 5.0. Remove it.
 2005-06-16 12:52:07 +10:00
stewart@mysql.com
29892126f9 Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11132 
into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11132
 2005-06-16 12:47:04 +10:00
tomas@poseidon.ndb.mysql.com
4bca931fac Bug #11221 Mysqld does not automatically reconnecting to cluster with cluster restart 2005-06-15 12:29:55 +02:00
stewart@mysql.com
fda3561e16 BUG#11132 Connections stuck in CLOSE_WAIT 
In 4.1 (it is different in 5.0), we do not use the mgm connection after fetching the
configuration (and if we did, we would have to have calls to check the connection and
reconnect if needed - in case the mgm server had restarted) so we can disconnect after
first use.

This means we won't have connections stuck in CLOSE_WAIT when the mgm server shuts down.
 2005-06-15 14:58:53 +10:00
pekka@mysql.com
362a45fd34 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/export/space/pekka/ndb/version/my41
 2005-06-14 04:00:37 +02:00
ndbdev@dl145b.mysql.com
be1177c15b merge 2005-06-14 00:05:27 +02:00
tulin@dl145c.mysql.com
57ddf5223f logging_ok: 
Logging to logging@openlogging.org accepted
DbtcMain.cpp, testTimeout.cpp:
  Bug  #11290 TransactionInactiveTimeout = 0 does not result in infinite timeout
 2005-06-13 19:45:15 +02:00
pekka@mysql.com
b5eddef181 ndb - valgrind fixes 2005-06-13 16:19:20 +02:00
joreland@mysql.com
920755dcd7 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-13 11:52:42 +02:00
joreland@mysql.com
ab1eaf0b32 merge 2005-06-13 10:42:12 +02:00
joreland@mysql.com
9b71605d6c Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-13 09:11:53 +02:00
joreland@mysql.com
2d64907d12 bug#10294 - ndb restore with #concurrent transactions < parallelism 
Enable retry on startTransaction
 2005-06-13 09:09:50 +02:00
joreland@mysql.com
35dfc96b1c Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-10 15:20:32 +02:00
joreland@mysql.com
ca619c1844 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-10 15:15:10 +02:00
joreland@mysql.com
77ef82cf55 ndb - 
Fix mem leak in testBlobs
 2005-06-10 15:13:44 +02:00
joreland@mysql.com
5ffe1f5d95 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-10 12:34:15 +02:00
joreland@mysql.com
46569b2a53 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-10 12:33:07 +02:00
joreland@mysql.com
96789d5ecb ndb - autotest 
Fix stack overflow in ndb_cpcd on amd64
 2005-06-10 12:31:55 +02:00
joreland@mysql.com
491001064a Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-10 10:31:21 +02:00
joreland@mysql.com
4de2f33d96 merge 2005-06-10 10:28:09 +02:00
joreland@mysql.com
decf8ed04e ndb - autotest 
script fixes for solaris
 2005-06-10 10:22:32 +02:00
acurtis@xiphis.org
3b8c3bd7e1 Merge 2005-06-09 17:15:06 +01:00
joreland@mysql.com
65e5d9e982 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-09 16:13:23 +02:00
joreland@mysql.com
b6fba9b40d merge 2005-06-09 16:11:34 +02:00
joreland@mysql.com
f6bb7cabbe merge 2005-06-09 15:44:57 +02:00
joreland@mysql.com
14d74e75db bug#11205 - ndb - 4006 when starting scan 2005-06-09 15:39:14 +02:00
joreland@mysql.com
a5a13ea8c8 ndb - autotest 
small script fixes
  - Don't use hostname -s as it's linux specific
  - Don't remove result unless scp worked
 2005-06-09 08:07:48 +02:00
joreland@mysql.com
e330bb5b2e Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-09 07:53:34 +02:00
joreland@mysql.com
3c82fb642c Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-09 07:52:02 +02:00
joreland@mysql.com
3765bb2df9 ndb - uint overflow when running on 64-bit platform with more than 4Gb of mem 
bug#10711
bug#10058
bug#9363
bug#9025
bug#8918
 2005-06-09 07:49:48 +02:00
joreland@mysql.com
dc191d5b17 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-08 17:12:08 +02:00
joreland@mysql.com
7bcc81c87b Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-08 16:55:06 +02:00
joreland@mysql.com
dc78a77206 bug#11166 - ndb 
Fix potential inconsistency when running ndb_restore due to faulty parsing
    of backup log wrt inserts
 2005-06-08 16:48:57 +02:00
msvensson@neptunus.(none)
8771c73258 BUG#10365 Cluster handler uses non-standard error codes 
- Added better error messages when trying to open a table that can't be discovered or unpacked. The most likely cause of this is that it does not have any frm data, probably since it has been created from NdbApi or is a NDB system table.
 - Separated functionality that was in ha_create_table_from_engine into two functions. One that checks if the table exists and another one that tries to create the table from the engine.
 2005-06-08 13:31:59 +02:00
stewart@mysql.com
a65c0b000a BUG#10893 Cluster hangs on initial startup 
IPCConfig wasn't constructing the connect string properly.
 2005-06-08 17:35:11 +10:00
joreland@mysql.com
5309177642 ndb - update test prg for testDict -n NF1 2005-06-07 18:06:49 +02:00
joreland@mysql.com
ebc9d76ddc Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-07 17:09:47 +02:00
joreland@mysql.com
e6dfe6aa36 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-06-07 15:25:21 +02:00
joreland@mysql.com
e697ec1c1c bug#11133 - ndb 
incorrect handling of writeTuple with multi op transaction
 2005-06-07 15:10:57 +02:00
joreland@mysql.com
60474c8b0b ndb - backup/restore, fix count of dist keys 
better fix for bug#10190
 2005-06-07 12:50:42 +02:00
joreland@mysql.com
7050d08f18 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-07 10:50:27 +02:00
stewart@mysql.com
ab96501e4c merge 2005-06-07 12:44:00 +10:00
stewart@mysql.com
61ff7d380a BUG#10948 NDB Replication: Race condition with ALTER/DROP table 
BUG#9826  Server crash on schema change ("drop table", "alter table") with NDB

See note on 10948 for detailed explanation.

struct a { void* a; long long b[1]; };

on PPC32 (and 32bit pa risc): 16
on x86: 12

so a malloc(sizeof(void*)+extra_bits) is wrong.

Assuming that the long long is 64 bit aligned as non-aligned 64bit accesses
are rather expensive on ppc.

Thanks to paulus for doing the PPC port of valgrind.
Without which I would no doubt still be trying to find this.
 2005-06-04 18:14:34 +10:00
tulin@dl145b.mysql.com
82d32b88e9 Merge dl145b.mysql.com:/home/ndbdev/tomas/mysql-4.1 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.0
 2005-06-02 21:31:25 +02:00
tulin@dl145b.mysql.com
342f6d54a3 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 
into dl145b.mysql.com:/home/ndbdev/tomas/tmp
 2005-06-02 21:25:37 +02:00
tulin@dl145b.mysql.com
72288df8fc CommandInterpreter.cpp: 
Bug #11050  	ndb_mgm "show" prints incorrectly after master data node fails
 2005-06-02 21:14:14 +02:00
msvensson@neptunus.(none)
f588da546f Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb 
into neptunus.(none):/home/msvensson/mysql/bug9626
 2005-06-02 14:57:46 +02:00
msvensson@neptunus.(none)
daaf6f077e BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree 
- Remove declaration of MAX_SECTION_SIZE
 2005-06-02 14:34:43 +02:00
msvensson@neptunus.(none)
abd3a84f7a BUG#9626 Several serious errors reported by Valgrind in latest 5.0 bk tree 
- Fix several valgrind warnings.
 2005-06-02 14:32:06 +02:00
pekka@mysql.com
786c181f1f ndb - NdbBlob.cpp: add DBUG 2005-06-02 13:40:42 +02:00
tomas@poseidon.ndb.mysql.com
a60bdadb31 Bug #11019 mgmapi start backup in some cases returns wrong backupid 2005-06-02 01:13:23 +02:00
joreland@mysql.com
db0973e910 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-01 13:09:59 +02:00
joreland@mysql.com
7e031804e4 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-01 13:07:47 +02:00
joreland@mysql.com
61638019a3 ndb - fix broken ndb_alter_table 
reinit AI len after preparing interpreted
 2005-06-01 13:05:41 +02:00
joreland@mysql.com
74ffba0c75 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-06-01 08:03:03 +02:00
joreland@mysql.com
bdd0f5f823 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-06-01 07:59:48 +02:00
joreland@mysql.com
48f5fae9ff bug#10956 - ndb - more than 7 NR --initial yields cluster failure 
a node wo/ filesystem don't have any crashed replicas
  reset noCrashedReplicas in invalidate_node_lcp
 2005-05-30 14:17:58 +02:00
joreland@mysql.com
9f499292b9 bug#10953 - ndb - scan read wo/ getvalue cause NF (during NR) 2005-05-30 11:55:47 +02:00
joreland@mysql.com
7a7728494e Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-26 22:51:05 +02:00
joreland@mysql.com
b4218497c4 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-26 22:49:49 +02:00
joreland@mysql.com
420ae9a452 ndb - add test case for bug ReadWithoutGetValue 2005-05-26 22:48:28 +02:00
joreland@mysql.com
b0068adc46 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-26 22:43:00 +02:00
joreland@mysql.com
500fdc2d2a merge 2005-05-26 22:42:13 +02:00
joreland@mysql.com
1366e9fa2f Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-26 22:22:43 +02:00
joreland@mysql.com
7043d06f16 merge 2005-05-26 22:10:43 +02:00
joreland@mysql.com
bf811eb711 bug#10669 - ndb read wo/ get value 
add dummy getvalue
 2005-05-26 22:04:50 +02:00
joreland@mysql.com
7be75f0a79 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-26 21:30:26 +02:00
msvensson@neptunus.(none)
697cfe7f07 Merge from 4.1 2005-05-26 21:01:55 +02:00
joerg@mysql.com
5178c84bef Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/M50/mysql-5.0
 2005-05-26 18:12:56 +02:00
joreland@mysql.com
8bba533f86 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-26 14:07:31 +02:00
joreland@mysql.com
7a471f7f69 bug#10190 - ndb 
ndb_restore invalid handling of distribution keys when restoring meta data
  (also aligned printout with that of ndb_desc)
 2005-05-26 14:03:26 +02:00
joerg@mysql.com
9504bd0ddd Manual merge. 2005-05-26 12:51:44 +02:00
msvensson@neptunus.(none)
5245f98c7d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-ndb 
into neptunus.(none):/home/msvensson/mysql/bug9626
 2005-05-26 12:41:14 +02:00
msvensson@neptunus.(none)
6c00006d2c Fix icc compiler warning 2005-05-26 12:12:36 +02:00
msvensson@neptunus.(none)
676ba73480 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
 2005-05-26 11:37:19 +02:00
msvensson@neptunus.(none)
f3cc29e93b Fix compiler warning 2005-05-26 11:36:01 +02:00
joreland@mysql.com
9e188eaeb9 ndb - Testcase for bug#10669 
--database option to hugo tools
 2005-05-26 07:21:05 +02:00
joreland@mysql.com
60d3e60e27 ndb - Embryo of overload protection 
Add method to query free send buffer size
 2005-05-25 16:19:17 +02:00
joreland@mysql.com
5189e9dd91 ndb autotest - merge jonathans script changes 2005-05-25 11:53:58 +02:00
joreland@mysql.com
c448ab53d6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-25 09:26:59 +02:00
joreland@mysql.com
cea14f253d ndb autotest 
adopt to changes in auto*tools
 2005-05-25 09:22:07 +02:00
stewart@mysql.com
119e500c80 BUG#10831 ndb mgmd LogDestination maxfiles does not rotate logs properly 2005-05-25 15:35:51 +10:00
joreland@mysql.com
83b248f4d5 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-24 17:09:01 +02:00
joreland@mysql.com
6132b0a528 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-24 17:05:20 +02:00
stewart@mysql.com
4de2acd961 BUG#10813 SCI Transporter build fails 
fix typo
 2005-05-24 11:24:26 +10:00
msvensson@neptunus.(none)
197978e3d1 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
 2005-05-23 19:01:16 +02:00
msvensson@neptunus.(none)
548994aa7b Build fixes for icc, compile _without_ "-no-gnu" 2005-05-23 18:53:53 +02:00
msvensson@neptunus.(none)
3973e55f49 Build fix 2005-05-23 15:02:02 +02:00
pekka@mysql.com
922a49961d ndb - test progs 2005-05-23 10:24:22 +02:00
pekka@mysql.com
cfb1b90005 ndb - NdbDictionaryImpl.cpp: fix access to freed memory 2005-05-22 20:47:08 +02:00
bell@sanja.is.com.ua
299f06d4fd Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 
into sanja.is.com.ua:/home/bell/mysql/bk/work-bug-5.0
 2005-05-20 17:32:36 +03:00
bell@sanja.is.com.ua
e37fbf2382 Macos 10.4 compatibility changes 2005-05-20 16:21:23 +03:00
monty@mysql.com
0b75f6e37b compatibility issues 
Fixed errors reported by valgrind (some errors in NDB remains)
 2005-05-20 16:14:35 +03:00
msvensson@neptunus.(none)
72dcde4111 Merge neptunus.(none):/home/msvensson/mysql/bug9626 
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-build
 2005-05-19 20:41:23 +02:00
msvensson@neptunus.(none)
920c16c055 BUG#9626 valgrind warnings 
- after review fixes
 2005-05-19 20:38:48 +02:00
magnus@msdesk.mysql.com
8a0f304375 Fix 2005-05-19 16:00:32 +02:00
msvensson@neptunus.(none)
a996abc594 Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into neptunus.(none):/home/msvensson/mysql/bug9626
 2005-05-19 14:53:57 +02:00
msvensson@neptunus.(none)
cb5bfad14e Fix 2005-05-19 12:53:44 +02:00
msvensson@neptunus.(none)
89415d272c Merge 2005-05-18 20:52:59 +02:00
msvensson@neptunus.(none)
2d515425a3 BUG#9626 
- Fix valgrind warnings
 - Remove static db, schema and table name buffers from Ndb.cpp
 2005-05-18 20:50:29 +02:00
jimw@mysql.com
3f6aad900c Resolve merge from 4.1 2005-05-18 11:06:34 -07:00
pekka@mysql.com
6dbcd43224 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/space/pekka/ndb/version/my41
 2005-05-18 18:05:37 +02:00
pekka@mysql.com
c054f84ae3 ndb - allow upgrade 4.1.10->4.1.12 2005-05-18 17:47:43 +02:00
tulin@dl145c.mysql.com
13bbb3dbb3 ndberror.c: 
updated error message for ndb
 2005-05-18 10:22:27 +02:00
pekka@mysql.com
3131434dcf ndb - wl-2451 update schemafile format change to 5.0.6 2005-05-15 18:10:30 +02:00
pekka@mysql.com
143ad5081a ndb - testScan -n ScanRead488O fix 2005-05-15 17:56:39 +02:00
joreland@mysql.com
1cd1359049 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-09 21:13:27 +02:00
joreland@mysql.com
5c4da6aa4d merge 2005-05-09 20:28:55 +02:00
joreland@mysql.com
b15797bbaa Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-09 15:15:25 +02:00
joreland@mysql.com
f2edd8069f bug#10471 - ndb - potential inconsistent backup 
whith some multi update scenarios

  Make sure to init GCI on correct operation before firering operation
 2005-05-09 14:59:49 +02:00
joreland@mysql.com
a36b2e3953 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-09 11:04:34 +02:00
joreland@mysql.com
28814b66f4 bug#10142 - ndb unique index resource shortage 
honor abort_option as TC now abort on 288
 2005-05-09 11:03:07 +02:00
mskold@mysql.com
9e1117c3e5 Merge 2005-05-08 22:52:55 +02:00
mskold@mysql.com
4b06c68d83 Fixes to compile with icc 2005-05-08 22:16:24 +02:00
joreland@mysql.com
40d913612e Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-08 20:25:11 +02:00
joreland@mysql.com
caa5cfc63f Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-08 20:23:56 +02:00
joreland@mysql.com
a91f302097 ndb - autotest 
fix name of result tar ball
 2005-05-08 20:23:05 +02:00
mskold@mysql.com
bea71274f7 Merge 2005-05-07 22:49:04 +02:00
mskold@mysql.com
cb8d2905aa bug#9813: Post review fixes 2005-05-07 22:04:52 +02:00
joreland@mysql.com
b15f8bcbaf Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-07 18:39:10 +02:00
joreland@mysql.com
0eb9947ce8 merge 2005-05-07 18:37:59 +02:00
joreland@mysql.com
5455e9ddd9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-07 18:28:18 +02:00
joreland@mysql.com
347c21fe42 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-07 18:22:51 +02:00
joreland@mysql.com
4d1804ebb1 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-07 18:21:36 +02:00
joreland@mysql.com
749129487e ndb - autotest 
fix configs and scripts
 2005-05-07 18:20:29 +02:00
ndbdev@ndbmaster.mysql.com
e31a07265f ndb autotest - add show version to cpcd 2005-05-07 16:06:41 +02:00
joreland@mysql.com
678bef34a8 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-07 13:27:06 +02:00
joreland@mysql.com
85066eb0a2 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-07 13:25:52 +02:00
joreland@mysql.com
092eea3a7a ndb - autotest 
fixes
 2005-05-07 13:23:38 +02:00
joreland@mysql.com
86fe0ecf2d Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-07 12:00:13 +02:00
joreland@mysql.com
74b792b92b merge 2005-05-07 11:56:10 +02:00
joreland@mysql.com
129b3d4ab9 ndb - autotest 
upgrades to shell script
 2005-05-07 11:53:06 +02:00
pekka@mysql.com
8ccd11182f ndb - bug#8928 2005-05-07 10:56:03 +02:00
joreland@mysql.com
05d21f4ec3 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-06 19:23:11 +02:00
joreland@mysql.com
ff81ca1c05 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-06 19:22:02 +02:00
joreland@mysql.com
46265f9ad2 ndb - autotest 
fix count of nodes needed in test
 2005-05-06 19:20:32 +02:00
joreland@mysql.com
575c1edf5b Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-06 18:59:37 +02:00
joreland@mysql.com
44fea2872d ndb - autotest 
fix to ndb-autotest.sh
 2005-05-06 18:58:46 +02:00
joreland@mysql.com
b76c160184 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-06 17:27:15 +02:00
joreland@mysql.com
80c2d9574a ndb - autotest 
Add shutdown options (so far only SIGKILL), so that there won't be any strace mysqld threads
 2005-05-06 17:26:22 +02:00
joreland@mysql.com
c93efc34ae Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-06 16:44:07 +02:00
joreland@mysql.com
2da6a86845 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-06 16:42:49 +02:00
joreland@mysql.com
df5eedb8aa ndb - autotest 
put config files in bk
 2005-05-06 16:41:46 +02:00
joreland@mysql.com
873ed5e0e7 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-06 16:16:25 +02:00
joreland@mysql.com
a5629a7ac7 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-06 16:15:57 +02:00
joreland@mysql.com
df80304435 ndb - autotest 
use newly created script for faster handling of several configurations
 2005-05-06 16:14:30 +02:00
joreland@mysql.com
9d0c542838 ndb - autotest 
update make-config script
 2005-05-06 15:37:51 +02:00
rburnett@bk-internal.mysql.com
ad6de2c05a Merge bk-internal.mysql.com:/users/rburnett/bug9721 
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
 2005-05-06 15:15:48 +02:00
joreland@mysql.com
deba12e775 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-06 14:46:19 +02:00
joreland@mysql.com
749a1f9a2b ndb - add support for mysql servers in autotest 2005-05-06 14:44:43 +02:00
ndbdev@ndbmaster.mysql.com
081933b02e ndb - add support for mysql servers in autotest 2005-05-06 12:46:52 +02:00
stewart@mysql.com
a17bf3f465 Bug#10193 
Invalid DataDir in config causes ndbd segfault
 2005-05-06 10:43:29 +02:00
konstantin@mysql.com
753959cd88 Manual merge 2005-05-05 13:47:09 +04:00
joreland@mysql.com
e1dad7a21b Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-05 11:11:03 +02:00
joreland@mysql.com
3ebc4a271f Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-05-05 11:09:50 +02:00
joreland@mysql.com
208e534acc ndb - testNodeRestart -n LateCommit 
increase no of rows so that the node failure will "guaranteed" produce an aborted transaction
 2005-05-05 11:09:00 +02:00
joreland@mysql.com
1f58420332 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-05 10:41:04 +02:00
joreland@mysql.com
15bfe83479 merge 2005-05-05 10:39:20 +02:00
joreland@mysql.com
4238092864 bug#10142 - ndb unique index 
post review fixes
 2005-05-05 10:34:39 +02:00
joreland@mysql.com
97feb2df6a Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-04 18:58:41 +02:00
joreland@mysql.com
a1faad1e64 merge 2005-05-04 18:48:33 +02:00
joreland@mysql.com
bf6e779b84 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-04 18:43:40 +02:00
joreland@mysql.com
0d17895910 bug#10358 - ndb 
Cluster failure with non started nodes can result in timedout transactions
 2005-05-04 18:40:54 +02:00
joreland@mysql.com
9ca0423435 merge 2005-05-04 17:29:41 +02:00
joreland@mysql.com
4a29d5b30e Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-04 14:32:09 +02:00
joreland@mysql.com
86c7c4d1e2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-05-04 14:29:33 +02:00
joreland@mysql.com
ef23f4295f bug#10330 - linking with ndb fails 
changes to handling of new/delete cxa_pure_virtual has changed in mysys
  remove "ndb"'s own impl. as they are no longer needed as we link mysys at all places
 2005-05-04 13:29:15 +02:00
tulin@dl145b.mysql.com
ccac26a27a logging_ok: 
Logging to logging@openlogging.org accepted
NDBT_ResultRow.cpp, ndb_restore.test, ndb_restore.result:
  BUG#10287
 2005-05-04 10:16:03 +02:00
joreland@mysql.com
7ebc32ee8b bug#10142 - ndb unhandle resource shortage in unique index code 2005-05-03 12:16:31 +02:00
joreland@mysql.com
74bf65d0e9 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-05-02 15:16:40 +02:00
mskold@mysql.com
47c2c96379 Merge 2005-04-28 10:28:56 +02:00
joreland@mysql.com
4766b99ec6 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-04-28 06:57:59 +02:00
mskold@mysql.com
5f9843aeee Fix for avoiding gettin Invalid schema object version when doing local changes 2005-04-27 18:17:41 +02:00
joreland@mysql.com
d6f80c436c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-04-27 07:56:37 +02:00
pekka@mysql.com
f30749a08e ndb - wl#2455 fix 2005-04-25 12:55:24 +02:00
joreland@mysql.com
9572e1b72b Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-04-25 12:01:03 +02:00
joreland@mysql.com
004ec3838d Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-25 11:59:50 +02:00
joreland@mysql.com
280bef1845 bug#9749 - ndb lock upgrade 
post review fix.
  don't init hash value on restart operations
  make sure that lock mode is correct in entire que.
 2005-04-25 11:59:00 +02:00
joreland@mysql.com
208200cbe0 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-04-25 08:45:12 +02:00
joreland@mysql.com
b57eab4377 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-25 08:44:05 +02:00
joreland@mysql.com
12e0d4f588 ndb - autotest 
add more tests to verify correctness of backups
 2005-04-25 08:43:16 +02:00
joreland@mysql.com
9f0a7e1729 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-04-25 08:39:36 +02:00
joreland@mysql.com
c4d44841c4 Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-25 08:38:28 +02:00
joreland@mysql.com
763d835a3c bug#9924 - ndb backup 
remove incorrect assertion
 2005-04-25 08:35:18 +02:00
joreland@mysql.com
08b7219de0 Merge mysql.com:/home/jonas/src/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-04-24 20:39:42 +02:00
joreland@mysql.com
e1e050432d Merge mysql.com:/home/jonas/src/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-24 20:38:53 +02:00
joreland@mysql.com
798e78787c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 
into mysql.com:/home/jonas/src/mysql-5.0
 2005-04-24 20:37:31 +02:00
joreland@mysql.com
d9d1c933b0 bug#9924 - ndb backup - abort handling 
uninit variable
 2005-04-24 20:34:42 +02:00
pekka@mysql.com
48d6d545c0 ndb - post merge 4.1->5.0 2005-04-23 18:51:18 +02:00
pekka@mysql.com
850211eb73 Merge 2005-04-23 17:55:21 +02:00
pekka@mysql.com
6778b029e0 ndb - bug#10029 fix 2005-04-23 17:33:12 +02:00
pekka@mysql.com
9856a3e818 ndb - wl#2455 cont'd 2005-04-22 13:59:35 +02:00
joreland@mysql.com
cde3ff4d26 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1 
into mysql.com:/home/jonas/src/mysql-4.1
 2005-04-22 13:20:47 +02:00
joreland@mysql.com
c768e1d1e7 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb 
into mysql.com:/home/jonas/src/mysql-5.0-ndb
 2005-04-22 13:07:35 +02:00