Commit graph

2320 commits

Author SHA1 Message Date
jonas@eel.(none)
a8519309dd Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-25 13:39:01 +02:00
jonas@eel.(none)
8afea954d9 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0
2005-08-25 13:21:58 +02:00
jonas@eel.(none)
7fe87018b4 bug#12027 - ndb
When detecting corrupt schema file.
  Make sure to close it (as it will be opened later when rewriting a clean copy)
2005-08-25 13:16:29 +02:00
monty@mishka.local
f384e08277 Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
tomas@poseidon.ndb.mysql.com
653e99dea2 removed ndb grep from configure .in 2005-08-23 12:16:16 +02:00
tomas@poseidon.ndb.mysql.com
28e3fe8759 enabled make of ndb_redo_log_reader 2005-08-23 11:50:24 +02:00
jonas@eel.(none)
d7349750e5 ndb - bug#12220
forgott to add KeyDescriptor.hpp
2005-08-22 11:25:03 +02:00
jonas@eel.(none)
90256d31d1 bug#12220 - ndb - node recovery with charsets
LQH computes incorrect hash values during NR (as it doesn't concider charsets)

  Solution: make LQH compute correct hash :-)
           1) move xfrm_key into SimulatedBlock so that there's _one_ impl.
           2) make TC, ACC, LQH use same impl.
2005-08-22 10:59:25 +02:00
jonas@eel.(none)
5823c91f88 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-21 16:22:08 +02:00
jonas@eel.(none)
6371e9a23f ndb
remove grep stuff
2005-08-19 13:20:36 +02:00
jonas@eel.(none)
bf835c89c2 ndb -
remove grep from Makefile
2005-08-19 10:12:44 +02:00
stewart@mysql.com
78bd379b29 Fix merge of BUG10950 and jonas' message improvements. 2005-08-19 00:48:03 +10:00
stewart@mysql.com
b17e14c5ff merge fix 2005-08-19 00:39:56 +10:00
jonas@eel.(none)
7c70be87b7 Merge eel.(none):/home/jonas/src/mysql-5.0
into  eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-18 14:28:13 +02:00
jonas@eel.(none)
6399a93ac2 Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-5.0
2005-08-18 14:25:00 +02:00
jonas@eel.(none)
96f719818c Merge eel.(none):/home/jonas/src/mysql-4.1
into  eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-18 14:07:31 +02:00
jonas@eel.(none)
3b68047235 bug#12118 - ndb alter table data loss
Split table version into 2 (major, minor)
  Impl. signaling to API when table has been altered
  Allow running transactions to use any minor number for transactions
2005-08-18 14:02:25 +02:00
stewart@mysql.com
eaf3af22b7 BUG#10950
make previous patch portable by abstracting to Ndb_check_socket_hup.
Is in portlib rather than mysys due to the socket parameter being NDB_SOCKET_TYPE
2005-08-17 08:40:11 +10:00
kent@mysql.com
fd4880814c Makefile.am:
config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
2005-08-11 13:47:24 +02:00
acurtis@xiphis.org
b9476f7d50 Merge xiphis.org:/usr/home/antony/work2/mysql-4.1
into  xiphis.org:/usr/home/antony/work2/merge-5.0
2005-08-11 12:18:53 +01:00
monty@mysql.com
30a51b5323 Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/home/my/mysql-4.1
2005-08-08 13:14:29 +03:00
kent@mysql.com
19ad0933f9 client_priv.h:
Removed ending comma in enum
Makefile.am:
  config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
ndb_config.cpp:
  Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp
2005-08-05 19:29:13 +02:00
lenz@mysql.com
eab37e1df3 Merge mysql.com:/data0/mysqldev/lenz/mysql-4.1
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
2005-08-03 14:17:31 +02:00
lenz@mysql.com
6893e5969a Portability fixes:
- Moved a few DBUG_ENTER statements after the variable declarations to satisfy some
   compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c
   and ndb/src/common/portlib/NdbThread.c
 - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in 
   ndb/tools/config.cpp
2005-08-03 13:46:38 +02:00
monty@mysql.com
987edeaa9b Fixed compiler warnings 2005-07-28 21:25:05 +03:00
joreland@mysql.com
3c59758fdc Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-25 15:31:38 +02:00
joreland@mysql.com
ca6eb7c70a Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 13:48:34 +02:00
joreland@mysql.com
0cd9e2e269 fix compile error 2005-07-25 13:47:40 +02:00
joreland@mysql.com
c12b41605d Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-25 13:23:34 +02:00
joreland@mysql.com
7040b3277a Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-25 12:42:32 +02:00
joreland@mysql.com
07cdfdca69 ndb - Fix LCP during SR parameters 2005-07-25 12:41:25 +02:00
joreland@mysql.com
8fc24f2634 merge error 2005-07-24 21:20:45 +02:00
joreland@mysql.com
293145b314 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-24 08:27:16 +02:00
joreland@mysql.com
5490cdfb24 Add tool to extract config info from ndb_mgmd 2005-07-23 12:06:02 +02:00
joreland@mysql.com
4f7360f31d ndb - hugo, fix closeTransaction in testPartitioning 2005-07-22 16:29:38 +02:00
joreland@mysql.com
21edad598d Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-22 14:32:17 +02:00
joreland@mysql.com
4fedf8462d bug#11133 - ndb write/lock upgrade
fix test case
  improve testing
2005-07-22 14:30:00 +02:00
stewart@mysql.com
390bc6197e Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
2005-07-22 22:22:53 +10:00
stewart@mysql.com
21891289fc Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into  mysql.com:/home/stewart/Documents/MySQL/5.0/bug10950
2005-07-22 22:18:43 +10:00
stewart@mysql.com
36b5406604 Merge mysql.com:/home/stewart/Documents/MySQL/5.0/main
into  mysql.com:/home/stewart/Documents/MySQL/5.0/wl2347
2005-07-22 21:43:25 +10:00
stewart@mysql.com
96f8cf3588 WL#2347 - Load independent heartbeats
Reset missed heartbeat count on receipt of signal from node.

This fixes a bug where that under high network load, the heartbeat packets could be
delayed, causing the appearance of node failure (due to lost heartbeats).
2005-07-22 20:29:25 +10:00
joreland@mysql.com
f4731e1f40 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-22 12:28:17 +02:00
joreland@mysql.com
fc2573a086 bug#11675 - ndb backup
Fix invalid backup log when using #nodes != 2^x
  Fix ndb_restore --printXXX options
    (among other init counters)
2005-07-22 12:17:53 +02:00
joreland@mysql.com
8b0a798c10 Merge mysql.com:/home/jonas/src/mysql-5.0
into  mysql.com:/home/jonas/src/mysql-5.0-push
2005-07-21 11:25:40 +02:00
joreland@mysql.com
5faa698eef Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-5.0
2005-07-21 11:22:21 +02:00
joreland@mysql.com
5939b37f29 Merge mysql.com:/home/jonas/src/mysql-4.1
into  mysql.com:/home/jonas/src/mysql-4.1-push
2005-07-21 11:15:44 +02:00
joreland@mysql.com
a7830ed93c bug#11942 - ndb - backup during DDL
fix bug introduced in alter table
2005-07-21 11:13:07 +02:00
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