jimw@mysql.com
1d997477aa
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-31 15:24:06 -07:00
tomas@poseidon.ndb.mysql.com
e0f3c5c0fb
Bug #12043 , do not core on misconfig unless debug compiled
2005-09-01 00:13:01 +02:00
tomas@poseidon.ndb.mysql.com
29dc269678
Bug#12833 corrected parsing of CLUSTERLOG command in ndb_mgm
2005-08-31 23:56:02 +02:00
tomas@poseidon.ndb.mysql.com
ce91c0f1c8
added make of ndb sys file printer
2005-08-31 23:24:50 +02:00
tomas@poseidon.ndb.mysql.com
9a91368997
improved the ndb redo log reader
2005-08-31 23:08:58 +02:00
tomas@poseidon.ndb.mysql.com
2b11fdba34
improved error message printing on filesystem refuse signals
2005-08-31 16:15:03 +02:00
tomas@poseidon.ndb.mysql.com
b9506c2324
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-31 13:10:35 +02:00
tomas@poseidon.ndb.mysql.com
6b4170ab10
corrected some erroneous ndb error messages
2005-08-31 13:09:18 +02:00
ramil@mysql.com
a16da25e06
Merge mysql.com:/usr/home/ram/work/4.1.b9613
...
into mysql.com:/usr/home/ram/work/mysql-5.0
2005-08-31 10:25:00 +05:00
jonas@eel.(none)
280f1849ca
Merge eel.(none):/home/jonas/src/mysql-5.0
...
into eel.(none):/home/jonas/src/mysql-5.0-push
2005-08-30 09:00:23 +02:00
jonas@eel.(none)
d61780999b
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:59:17 +02:00
jonas@eel.(none)
6461071c12
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-5.0
2005-08-30 08:58:41 +02:00
jonas@eel.(none)
91086d663c
Merge eel.(none):/home/jonas/src/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-30 08:57:30 +02:00
jonas@eel.(none)
4cc90aaab8
bug#12862 - ndb compile error
...
fix typo
2005-08-30 08:56:46 +02:00
tomas@poseidon.ndb.mysql.com
dba2e0074b
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2005-08-29 18:25:11 +02:00
tomas@poseidon.ndb.mysql.com
60df5fffb3
updated ndb redo file reader with schemaversion in commit rcord instead of prepare record
2005-08-29 18:23:53 +02:00
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)
c2b8f4ada3
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into eel.(none):/home/jonas/src/mysql-4.1-push
2005-08-25 13:37:55 +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