tomas@poseidon.mysql.com
9f586e3e61
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gca
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca
2007-02-26 23:50:02 +07:00
jonas@eel.(none)
6d9d1f9737
ndb - bug#26481 - fix of bug fix
...
Make sure GCP_SAVEREQ is not allowed before START_RECCONF has been sent...START_RECREQ is not enough
2007-02-22 15:02:48 +01:00
jonas@perch.ndb.mysql.com
d424ffbd4e
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-21 18:03:17 +01:00
jonas@eel.(none)
53fe7d831c
Merge localhost:/home/jonas/src/51-work
...
into eel.(none):/home/jonas/src/51-work
2007-02-21 16:44:39 +01:00
jonas@eel.(none)
5fd96a4526
ndb - bug#26514
...
fix overflow that could occur when have either lots of dd-data or very high dd-parallelism
2007-02-21 16:33:16 +01:00
jonas@eel.(none)
be0798a0c3
ndb - bug#26487
...
fix bug in extent/page allocation when *using* >1gb datafiles
2007-02-21 14:40:15 +01:00
jonas@eel.(none)
5059ce2143
ndb -
...
write testcase for bug#26450...
no solution however...
2007-02-20 20:33:53 +01:00
jonas@perch.ndb.mysql.com
1d99e609ed
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-20 00:58:25 +01:00
jonas@perch.ndb.mysql.com
f2e2e7a6e7
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-02-19 22:53:17 +01:00
jonas@perch.ndb.mysql.com
6c54eccda2
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca
2007-02-19 21:19:21 +01:00
tomas@poseidon.mysql.com
44c483cdda
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-25 18:14:51 +07:00
tomas@poseidon.mysql.com
46bcfff2a5
ndb:
...
- added extra cluster connect inicator bit for better handeling of delacation of event operations on cluster disconnect
- added extra assert to try to track down valgrind issue
2007-01-25 11:17:51 +07:00
svoj@april.(none)
3efc296508
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-01-25 01:44:30 +04:00
svoj@june.mysql.com
77515e27f7
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
2007-01-24 11:54:38 +04:00
stewart@willster.(none)
76d4191379
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
2007-01-24 16:16:16 +11:00
stewart@willster.(none)
6d267551a3
Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndb
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
2007-01-24 00:37:11 +11:00
stewart@willster.(none)
dbaab7f474
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug25487
...
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug25567
2007-01-24 00:34:12 +11:00
svoj@june.mysql.com
0b0dfe6f64
Merge mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24401/mysql-5.1-engines
2007-01-23 16:36:29 +04:00
tomas@poseidon.mysql.com
9a85d74e2a
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 11:46:13 +07:00
tomas@poseidon.mysql.com
cd5f9b2f3e
Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-23 07:25:24 +07:00
jonas@perch.ndb.mysql.com
6fae8d4133
Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 22:25:56 +01:00
jonas@perch.ndb.mysql.com
2e9fc22732
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 17:57:13 +01:00
jonas@eel.(none)
220eb32a3b
ndb - bug#25755
...
remove accidently left debug prinouts
2007-01-22 17:29:11 +01:00
jonas@eel.(none)
e7e4dde51e
ndb - bug#25755
...
Make sure subscriber is removed from list when n_subscribers is decreased
2007-01-22 17:25:49 +01:00
jonas@perch.ndb.mysql.com
bae96d8ddb
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-22 17:16:36 +01:00
jonas@eel.(none)
f7c6b13375
ndb - fix bug is NODE_VERSION_REP
...
Fix assertion in corner-case where signal isnt sent to any node
2007-01-22 17:06:27 +01:00
brian@zim.(none)
b2bfd35378
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-21 11:43:37 -08:00
brian@zim.(none)
068d7c8203
Just adding support for a "minor" version number.
2007-01-21 11:41:00 -08:00
baker@bk-internal.mysql.com
42345b83c3
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-21 02:21:23 +01:00
brian@zim.(none)
4b58f41481
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-newformat-5.1
2007-01-20 17:21:22 -08:00
brian@zim.(none)
dee24c66ba
1) New dirty state for files (need this for longterm fast recovery)
...
2) We now store shortest and longest row information.
3) archive_reader can now check and backup files (even if they are hot)
4) We now record longest and shortest row information for stats.
2007-01-20 17:19:54 -08:00
jonas@perch.ndb.mysql.com
68efcc062b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-20 03:02:39 +01:00
jonas@perch.ndb.mysql.com
162aa18e15
ndb - Fix bug when sending NODE_VERSION_REP
2007-01-20 03:01:37 +01:00
jonas@perch.ndb.mysql.com
9bef4afe9f
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 19:00:12 +01:00
jonas@perch.ndb.mysql.com
372cbc1def
ndb - bug#19645
...
fix some more sp100 hang cases
2007-01-19 17:01:52 +01:00
jonas@perch.ndb.mysql.com
1c62054244
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:05:28 +01:00
jonas@perch.ndb.mysql.com
c8f5f7483b
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-19 15:02:29 +01:00
jonas@perch.ndb.mysql.com
31824a1329
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-19 15:00:49 +01:00
istruewing@chilla.local
2a0ca5df8c
Merge chilla.local:/home/mydev/mysql-5.0-bug24607
...
into chilla.local:/home/mydev/mysql-5.1-bug24607
2007-01-19 13:08:09 +01:00
tomas@poseidon.mysql.com
9ca0af92b1
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-01-19 11:36:39 +01:00
tomas@poseidon.mysql.com
9c8ab666b0
Bug#25387 ndb: dbug assert in reference counting for event operations
...
- on blob part execute failure, must leave in state executin, and await dropEventOperation
2007-01-19 11:35:00 +01:00
tsmith@siva.hindu.god
94f7990ef8
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/50
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:41:52 -07:00
tsmith@siva.hindu.god
cc7afe2494
Merge siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/51
...
into siva.hindu.god:/home/tsmith/m/bk/mrg-jan17/maint/51
2007-01-18 08:30:35 -07:00
jonas@perch.ndb.mysql.com
7a133330f1
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-17 21:25:56 +01:00
jonas@perch.ndb.mysql.com
024fa0de88
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-17 21:23:59 +01:00
baker@bk-internal.mysql.com
7acead9c68
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-17 17:11:53 +01:00
tomas@poseidon.mysql.com
79e80aac49
Bug#25387 - added comments in code suggestion during review
2007-01-17 10:53:42 +01:00
svoj@june.mysql.com
5fb3cfdeea
Merge mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG24855/mysql-5.1-engines
2007-01-17 13:11:37 +04:00
tomas@poseidon.mysql.com
ec0969f9de
Bug#25387 - ndb: dbug assert in reference counting for event operations
...
- blob event operation not reference counted correctly, missing TE_ACTIVE
- add reference counting for blobs events
- make sure also blob event operations get TE_ACTIVE
- some minor cleanups + adjustment of dbug prints
2007-01-16 19:22:10 +01:00
jonas@perch.ndb.mysql.com
a441ea8b8f
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-16 19:01:34 +01:00
jonas@perch.ndb.mysql.com
c4163365a6
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-16 18:59:31 +01:00
jonas@perch.ndb.mysql.com
045985df4f
ndb - bug#25636
...
additional fix after autotest
dont send start_fragreq to temporary tables such as ordered indexes...
2007-01-16 18:58:43 +01:00
mskold/marty@linux.site
53b252025b
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndb
...
into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
2007-01-16 14:33:40 +01:00
mskold/marty@mysql.com/linux.site
3c36b92a1d
Changed Dictionary::Table::setTablespace/getTablespace to setTablespaceName/getTablespaceName
2007-01-16 09:19:41 +01:00
jonas@perch.ndb.mysql.com
633b32f443
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-15 21:05:14 +01:00
jonas@perch.ndb.mysql.com
b3c177073a
ndb - bug#25636
...
Fix DD problem during NR after 3 missed LCP's
2007-01-15 21:03:39 +01:00
kent@kent-amd64.(none)
f9ac031dd0
Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
2007-01-15 10:37:27 +01:00
baker@bk-internal.mysql.com
affdd4b363
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-14 04:51:23 +01:00
brian@zim.(none)
834485bc80
Updates to archive_reader.
2007-01-13 19:51:22 -08:00
brian@zim.(none)
e2f4aa82c4
More windows warnings cleanup
2007-01-13 17:19:20 -08:00
brian@zim.(none)
81b8d0868b
REAL_PATH was rewritten for DATA DIRECTORY (doesn't get calculated for each table open, and won't be calculted more then once now).
...
Windows warnings cleanup.
I am still get a weird warning about file descriptors closed multiple times.
2007-01-13 16:16:56 -08:00
brian@zim.(none)
f149e8176f
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-format-5.1
2007-01-12 20:07:33 -08:00
brian@zim.(none)
4e8d92e5dd
Final cleanup for new archive internal format. All new headers work.
2007-01-12 20:05:55 -08:00
kostja@bodhi.local
16d53afcd2
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-12 22:06:46 +03:00
jonas@perch.ndb.mysql.com
c3b7512130
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-12 15:50:51 +01:00
jonas@perch.ndb.mysql.com
f8fdb7c997
ndb - bug#25587
...
fix not aligned or non 32-bit values in "smart" scan
2007-01-12 15:48:47 +01:00
gluh@eagle.(none)
cf41e1ec63
Merge mysql.com:/home/gluh/MySQL/Merge/5.1
...
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
2007-01-12 14:47:11 +04:00
jonas@perch.ndb.mysql.com
ef283377a9
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-11 21:13:17 +01:00
jonas@perch.ndb.mysql.com
cf53471347
Merge perch.ndb.mysql.com:/home/jonas/src/51-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2007-01-11 21:09:27 +01:00
jonas@perch.ndb.mysql.com
a4570b092a
fix merge error
2007-01-11 21:06:36 +01:00
jonas@perch.ndb.mysql.com
546c2f5069
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-11 21:02:38 +01:00
kostja@bodhi.local
b72c2771dc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime
2007-01-11 22:15:20 +03:00
joerg@trift2.
05d161e04c
Merge trift2.:/MySQL/M51/mysql-5.1
...
into trift2.:/MySQL/M51/push-5.1
2007-01-11 19:40:05 +01:00
brian@zim.(none)
ab1a97f5ef
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/archive-format-5.1
2007-01-11 00:28:22 -08:00
brian@zim.(none)
9879f4363f
New azio which keeps meta data in its own header.
2007-01-10 23:53:08 -08:00
jonas@perch.ndb.mysql.com
403efda294
ndb - bug#25468
...
handle partially transfered LCP_FRAG_REP after node failure
recommit to 51-work
2007-01-10 20:50:19 +01:00
holyfoot/hf@deer.(none)
814c1308ea
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 18:33:28 +04:00
holyfoot/hf@deer.(none)
743beccf87
Merge mysql.com:/home/hf/work/22451/my51-22451
...
into mysql.com:/home/hf/work/mysql-5.1-mrg
2007-01-10 16:22:47 +04:00
holyfoot/hf@hfmain.(none)
93a7321d45
Merge mysql.com:/d2/hf/common/my51-common
...
into mysql.com:/d2/hf/mr10/my51-mr10
2007-01-10 14:34:28 +04:00
gluh@mysql.com/eagle.(none)
91d75da75e
Fix for bug#25026 information_schema.KEY_COLUMN_USAGE
.REFERENCED_TABLE_NAME
returns garbage
...
Unencode internal db & table name
2007-01-09 18:14:04 +04:00
kroki/tomash@moonlight.home
067b80a8d3
Fix after manual merge.
2007-01-09 13:07:39 +03:00
kroki/tomash@moonlight.home
7bf893f551
Merge moonlight.home:/home/tomash/src/mysql_ab/mysql-5.0-bug23443
...
into moonlight.home:/home/tomash/src/mysql_ab/mysql-5.1-bug23443
2007-01-09 12:44:16 +03:00
holyfoot/hf@hfmain.(none)
ae836b4203
Merge bk@192.168.21.1:mysql-5.1
...
into mysql.com:/d2/hf/opt/my51-opt
2007-01-09 12:55:11 +04:00
gkodinov/kgeorge@macbook.local
23acc5b630
mi_check.c:
...
added a missing DBUG_RETURN
2007-01-08 17:27:28 +02:00
mmj@thorsen-consulting.dk
4e0e863a4e
Merge mjorgensen@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build
2007-01-08 12:46:57 +01:00
gkodinov/kgeorge@macbook.local
a30c09c33f
Merge macbook.local:/Users/kgeorge/mysql/work/mysql-5.0-opt
...
into macbook.local:/Users/kgeorge/mysql/work/merge-5.1-opt
2007-01-08 12:32:48 +02:00
cmiller@zippy.cornsilk.net
a16eaf3301
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint-greener
2007-01-07 09:31:49 -05:00
tsmith@siva.hindu.god
eb8cf09388
Merge siva.hindu.god:/home/tsmith/m/inno/jan04/51
...
into siva.hindu.god:/home/tsmith/m/bk/51-build
2007-01-05 16:05:48 -07:00
tsmith@siva.hindu.god
7a2d8c14dd
Applied innodb-5.1-ss1039 and innodb-5.1-ss1134 snapshots.
...
Fixes:
- Bug #24712 : SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386 : Performance degradation caused by instrumentation in mutex_struct
- Bug #24190 : many exportable definitions of field_in_record_is_null
- Bug #21468 : InnoDB crash during recovery with corrupted data pages: XA bug?
2007-01-04 19:51:34 -07:00
brian@zim.(none)
c578350e05
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-arch
...
into zim.(none):/home/brian/mysql/merge-5.1
2007-01-04 12:06:40 -08:00
brian@zim.(none)
452a1331b2
The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space).
2007-01-04 11:41:17 -08:00
baker@bk-internal.mysql.com
9ffaf185f0
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
...
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
2007-01-04 19:54:52 +01:00
jonas@perch.ndb.mysql.com
a1fdeba328
ndb - bug#25329
...
extra sledge hammer, (real 51)
use dicklock to prevent SUB_START_REQ during node recovery
2007-01-04 11:13:19 +01:00
jonas@perch.ndb.mysql.com
8cf69ddb8b
ndb - recommit extra version info to real-51
2007-01-04 10:59:12 +01:00
jonas@perch.ndb.mysql.com
db8cd1ec44
ndb - bug#25329
...
Fix most obvious error in dict/suma error handling of events
2007-01-04 10:03:11 +01:00
brian@zim.(none)
6ff7092698
Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better.
2007-01-03 17:26:45 -08:00
istruewing@chilla.local
54c147a1bc
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-01-03 10:27:51 +01:00
jonas@perch.ndb.mysql.com
c73b27f59b
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2007-01-03 06:47:23 +01:00
malff/marcsql@weblab.(none)
0055056c91
Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-base
...
into weblab.(none):/home/marcsql/TREE/mysql-5.1-merge
2007-01-02 14:18:13 -07:00
kent@kent-amd64.(none)
c92b3b9b6a
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-01 10:54:14 +01:00