Commit graph

2163 commits

Author SHA1 Message Date
pekka@mysql.com
5b9bd8c0c8 Merge 2005-04-01 10:13:37 +02:00
mskold@mysql.com
b5e57be56b Fixed so no merge conflict with 5.0 2005-03-31 19:18:50 +02:00
pekka@mysql.com
af63ce9d22 ndb - fix small memory leak 2005-03-31 16:22:46 +02:00
mskold@mysql.com
75a4dc9644 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1
2005-03-31 14:33:51 +02:00
mskold@mysql.com
9795e7eda9 Removed warnings 2005-03-31 14:31:06 +02:00
pekka@mysql.com
10a03ce6c8 ndb - CSC#4927: ordered index + long pk, second half 2005-03-30 22:17:11 +02:00
joreland@mysql.com
738b9f9b8c Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-29 12:04:57 +02:00
joreland@mysql.com
9642b95c6c Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-29 12:02:28 +02:00
joreland@mysql.com
f83a426cf2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-29 12:00:43 +02:00
monty@mysql.com
c4467b817d Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
2005-03-29 12:58:31 +03:00
monty@mysql.com
dd4b0710dd Cleanups during review 2005-03-29 12:37:36 +03:00
pekka@mysql.com
a259bcebd7 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41
2005-03-28 22:56:40 +02:00
pekka@mysql.com
5dea61b879 ndb - set up long key page vars in ACC_LOCKREQ (bug#????) 2005-03-28 22:55:32 +02:00
pekka@mysql.com
2a428a1af9 Merge mysql.com:/export/space/pekka/ndb/version/my41
into mysql.com:/export/space/pekka/ndb/version/my50
2005-03-28 11:52:16 +02:00
pekka@mysql.com
42a641ffde ndb - make printSchemaFile available (compile manually) 2005-03-28 11:51:31 +02:00
jimw@mysql.com
dee535be63 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-03-25 10:51:08 -08:00
jimw@mysql.com
4f19826d80 Merge mysql.com:/home/jimw/my/mysql-4.1-9323
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-03-25 09:45:58 -08:00
joreland@mysql.com
7fbe97d36e ndb - super pool - compile fix
remove extra qualification which picky gcc complains about
2005-03-23 09:09:13 +01:00
joreland@mysql.com
394b62966f Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-23 08:18:53 +01:00
joreland@mysql.com
ad9bfaeba9 merge 2005-03-23 08:12:52 +01:00
joreland@mysql.com
b2c9ab4bb2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-23 08:08:05 +01:00
joreland@mysql.com
e20ff10bd2 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-23 07:58:25 +01:00
jimw@mysql.com
0842efeab2 Fix calls to memset() with arguments out of order. (Bug #9323) 2005-03-22 16:00:02 -08:00
mskold@mysql.com
68e5cf494e Merged 2005-03-22 22:31:51 +01:00
mskold@mysql.com
9347abfe8d Simplified rounding up to nearest 64-bit boundry 2005-03-22 22:12:24 +01:00
mskold@mysql.com
27dbed4384 Extra fix for perceived problem with fix for Bug #8753 Invalid schema object version after dropping index 2005-03-22 17:42:08 +01:00
pekka@mysql.com
743dae5e23 ndb - common pool for records 2005-03-21 12:01:25 +01:00
joreland@mysql.com
3db6607c8b Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-20 21:18:22 +01:00
joreland@mysql.com
182d0453db merge 2005-03-20 20:11:44 +01:00
joreland@mysql.com
edaf9d6177 ndb -
Fix uninit variable (potential segv) in Dbacc::sendNextScanConf
  discovered by magnus addition in "globals_list"
2005-03-20 20:07:12 +01:00
joreland@mysql.com
702883616e Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-19 13:47:38 +01:00
joerg@mysql.com
9d0b81880c Manual merge: Do not re-use the same identifier at loop level within a function (IRIX!). 2005-03-16 17:05:07 +01:00
joerg@mysql.com
29a78e7e88 Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1 2005-03-16 16:44:31 +01:00
mskold@mysql.com
41cddfe6f2 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
2005-03-16 11:33:02 +01:00
joreland@mysql.com
642bcfed5a Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-16 09:45:27 +01:00
joreland@mysql.com
bd9746b24b Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-16 09:44:39 +01:00
mskold@mysql.com
057d78650e Fix for bug#9166: Cluster compile failure on Solaris 10 2005-03-15 22:19:55 +01:00
joreland@mysql.com
8796bfe5de Merge 2005-03-15 21:08:28 +01:00
joreland@mysql.com
9ab5f5c0d9 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
into mysql.com:/home/jonas/src/mysql-5.0-ndb
2005-03-15 20:17:00 +01:00
msvensson@neptunus.(none)
3f8a66cbea Merged WL#2269 to mysql-5.0 2005-03-15 15:22:40 +01:00
joerg@mysql.com
281af2f9bc Proactive compile fix (in case we ever enable "EVENT_DEBUG" on IRIX). 2005-03-15 12:40:28 +01:00
pekka@mysql.com
d8d8cf1f72 Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/space/pekka/ndb/version/my50
2005-03-15 12:06:29 +01:00
pekka@mysql.com
23355a3c95 ndb - valgrind/compile fix Transporter.cpp: missing return 2005-03-15 12:01:41 +01:00
joerg@mysql.com
74708ae075 Avoid compilation error: On IRIX, identifiers with loop scope still need to be unique
at function level.
2005-03-15 11:55:27 +01:00
msvensson@neptunus.(none)
93831e4c91 Removed faulty impl. 2005-03-10 13:09:41 +01:00
msvensson@neptunus.(none)
792cab1973 Garbage "global" local variables in Dbacc 2005-03-10 13:06:22 +01:00
tomas@poseidon.ndb.mysql.com
59389925ba Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-10 11:33:36 +01:00
msvensson@neptunus.(none)
19cc402624 Fix uninitialised variable in Dbacc 2005-03-10 10:46:19 +01:00
joreland@mysql.com
f2f36ea64f Merge mysql.com:/home/jonas/src/fix
into mysql.com:/home/jonas/src/mysql-5.0
2005-03-10 08:26:14 +01:00
heikki@hundin.mysql.fi
bfb5d79eb3 Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0
2005-03-10 09:07:42 +02:00