serg@serg.mylan
5cd866610d
after merge fix
2005-04-06 23:12:10 +02:00
serg@serg.mylan
e1e5b97dea
manually merged
...
Gluh's SESSION/GLOBAL for @variables fix in sql_yacc.yy and
Bar's well_formed_len() changes in ndb code
did not make it and should be re-applied manually
2005-04-06 21:19:20 +02:00
bar@mysql.com
0134a2b286
Adding a new parameter for well_formed_length to
...
return error. We'll use it for better warnign reporting.
2005-04-06 11:53:15 +05:00
pekka@mysql.com
114b421c8b
ndb - csc#4847 release scan op early to save memory
2005-04-05 13:14:03 +02:00
pekka@mysql.com
328b453c86
merge
2005-04-01 11:21:55 +02:00
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
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
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
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
mskold@mysql.com
057d78650e
Fix for bug#9166: Cluster compile failure on Solaris 10
2005-03-15 22:19:55 +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
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
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
joreland@mysql.com
87c93bc514
Merge mysql.com:/home/jonas/src/fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-10 07:48:44 +01:00
joreland@mysql.com
364b3b7b9b
bug#9089
...
ndb - Reenable MAX_OPEN_FILES to enable LCP in some situations
2005-03-10 07:45:17 +01:00
tomas@poseidon.ndb.mysql.com
3e95113461
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-03-09 21:19:57 +01:00
serg@serg.mylan
956682de1a
merged
2005-03-09 14:09:06 +01:00
tomas@poseidon.ndb.mysql.com
70a9055d6a
fixed mem leak in subscriction handling in Suma
...
debug printouts
ndb documentation update
2005-03-09 11:49:48 +01:00
joreland@mysql.com
241c5e1046
bug#9052 - ndb - Use correct length during unique index build
...
(recommit as 4.1->5.0 merge is not possible)
2005-03-09 07:49:03 +01:00
tomas@poseidon.ndb.mysql.com
b87f470104
added testcase for multiple tables and events
2005-03-09 01:22:12 +01:00
tomas@poseidon.ndb.mysql.com
94dc32b37a
fixed bug in event handling of several tables
...
fix crashing bug in Dict caused by Suma on CREATE_SUBID_REF
2005-03-09 01:00:08 +01:00
joreland@mysql.com
c66c2a747f
bug#9052 - ndb - Use correct length during unique index build
2005-03-08 15:26:34 +01:00
joreland@mysql.com
fcd7b0ebc6
Merge mysql.com:/home/jonas/src/fix
...
into mysql.com:/home/jonas/src/mysql-4.1
2005-03-08 10:27:37 +01:00
joreland@mysql.com
56bc9cfacb
bug#8918 - ndb - improve error message when stopping due to StartFailureTimeout
2005-03-08 10:25:21 +01:00
tomas@poseidon.ndb.mysql.com
95412d8c17
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2005-03-07 21:33:02 +01:00
tomas@poseidon.ndb.mysql.com
fce9386016
added test compare function for testing event
...
fixed one bug in event, pk comes first in events...
2005-03-07 18:47:47 +01:00
pekka@mysql.com
3a346382cc
ndb - remove obsolete attribute storage type ACC vs TUP
2005-03-06 14:09:28 +01:00
tomas@poseidon.ndb.mysql.com
0d6947de5b
make sure the own node is set as connected...
2005-03-04 20:21:02 +01:00
