svoj@mysql.com/june.mysql.com
c8717280a9
BUG#28026 - Falcon: crash if partitions and select for update
...
Assertion failure may happen with falcon + partition + select for
update. This may affect other engines as well.
Though assertion failure is fixed with this patch, falcon still
deadlocks when running falcon_bug_28026.test.
2007-06-25 14:42:35 +05:00
svoj@april.(none)
af1f24cf21
Merge mysql.com:/home/svoj/devel/mysql/BUG15787/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG15787/mysql-5.1-engines
2007-06-24 19:46:14 +05:00
svoj@mysql.com/april.(none)
717c8fe98e
BUG#15787 - MySQL crashes when archive table exceeds 2GB
...
Max compressed file size was calculated incorretly causing server
crash on INSERT.
With this patch we use proper max file size provided by zlib.
Affects 5.0 only.
2007-06-24 19:44:54 +05:00
svoj@april.(none)
c62450bbb9
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1-engines
...
into mysql.com:/home/svoj/devel/mysql/BUG28971/mysql-5.1-engines
2007-06-22 23:14:59 +05:00
bar@mysql.com/bar.myoffice.izhnet.ru
020eedd446
mtr_report.pl:
...
Ignore warning about file name
having question marks.
2007-06-19 15:34:21 +05:00
svoj@june.mysql.com
674675a70c
Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-06-18 11:49:36 +05:00
svoj@june.mysql.com
621dd1724e
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
2007-06-18 11:49:01 +05:00
svoj@june.mysql.com
491e471fb3
Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-engines
2007-06-18 11:47:47 +05:00
df@pippilotta.erinye.com
7013c96fdf
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-06-18 07:58:51 +02:00
df@pippilotta.erinye.com
7cdb354d26
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-06-18 07:56:29 +02:00
df@pippilotta.erinye.com
f369105aa4
Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-18 07:42:13 +02:00
tomas@whalegate.ndb.mysql.com
1bfd45c277
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 22:07:21 +02:00
tomas@whalegate.ndb.mysql.com
795b9de49d
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 22:06:47 +02:00
tomas@whalegate.ndb.mysql.com
4547957450
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 22:06:34 +02:00
tomas@whalegate.ndb.mysql.com
04ea0c3357
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-17 22:05:33 +02:00
tomas@whalegate.ndb.mysql.com
8a08ac40fb
correct test and result
2007-06-17 22:04:01 +02:00
tomas@whalegate.ndb.mysql.com
0d8c48da57
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:55:41 +02:00
tomas@whalegate.ndb.mysql.com
d20cc54cb8
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-17 19:54:54 +02:00
tomas@whalegate.ndb.mysql.com
d1516ed29e
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:53:43 +02:00
tomas@whalegate.ndb.mysql.com
8eb940de27
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 19:52:01 +02:00
tomas@whalegate.ndb.mysql.com
b5f30a99f9
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
2007-06-17 19:50:07 +02:00
tomas@whalegate.ndb.mysql.com
885ca40f37
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:48:51 +02:00
tomas@whalegate.ndb.mysql.com
6b8e7c9484
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:47:56 +02:00
tomas@whalegate.ndb.mysql.com
ff804bc546
Bug #28989 hpux11 ps_row warnings
...
- do not print 701 dictionary busy error
2007-06-17 19:47:20 +02:00
tomas@whalegate.ndb.mysql.com
baf9e764dc
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 19:30:09 +02:00
tomas@whalegate.ndb.mysql.com
1e7fdaabee
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2007-06-17 19:29:15 +02:00
tomas@whalegate.ndb.mysql.com
9c5183ace9
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 19:28:01 +02:00
tomas@whalegate.ndb.mysql.com
9e3c14fae3
BUG#27640
...
- correct test and result file
2007-06-17 19:27:20 +02:00
tomas@whalegate.ndb.mysql.com
a61907f4fc
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 17:22:27 +02:00
tomas@whalegate.ndb.mysql.com
830be6deac
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-engines
2007-06-17 17:21:27 +02:00
tomas@whalegate.ndb.mysql.com
95ed412809
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
...
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-engines
2007-06-17 16:26:35 +02:00
istruewing@chilla.local
7d2fc98470
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-16 13:16:09 +02:00
istruewing@chilla.local
938fc3d66e
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-16 13:14:23 +02:00
istruewing@chilla.local
70600c15d8
Merge chilla.local:/home/mydev/mysql-5.0-amain
...
into chilla.local:/home/mydev/mysql-5.0-axmrg
2007-06-16 11:34:21 +02:00
tomas@whalegate.ndb.mysql.com
8d31148899
Bug #28949
...
- handler binlog's must be shutdoem before logger.cleanup_base
2007-06-16 11:16:02 +02:00
df@pippilotta.erinye.com
0cf4955ab4
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-16 06:41:59 +02:00
df@pippilotta.erinye.com
274bdc626d
Merge bk-internal:/home/bk/mysql-5.1-new-maint
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-16 06:29:03 +02:00
df@pippilotta.erinye.com
872c090b83
Merge bk-internal:/home/bk/mysql-5.0-maint
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-16 06:19:47 +02:00
df@pippilotta.erinye.com
c8f14b1a0a
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-16 06:17:19 +02:00
df@pippilotta.erinye.com
b2b965b534
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
...
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-06-16 06:16:00 +02:00
tsmith@quadxeon.mysql.com
891116551e
binlog.result, binlog.test:
...
Post-merge fix: replace xid=* with XID to isolate from number of transactions
2007-06-15 23:57:53 +02:00
iggy@alf.
e0adab8ce7
Merge alf.:D:/src/mysql-5.1-maint
...
into alf.:D:/src/mysql-5.1-maint_winemb
2007-06-15 14:45:44 -04:00
iggy@alf.
c15a2647a0
Embedded Server doesn't build on Windows.
...
- Add build configuration parameter EMBEDDED_ONLY which will configure
the VS solution to produce only mysql embedded binary.
- Make necessary updates to successfully compile solution.
2007-06-15 14:32:16 -04:00
istruewing@chilla.local
9f6ea22b77
Merge chilla.local:/home/mydev/mysql-5.0-axmrg
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 20:24:40 +02:00
istruewing@chilla.local
875cac1ffb
Merge chilla.local:/home/mydev/mysql-5.1-amain
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 20:23:20 +02:00
istruewing@chilla.local
b64b1a56d6
Merge chilla.local:/home/mydev/mysql-5.1-ateam
...
into chilla.local:/home/mydev/mysql-5.1-axmrg
2007-06-15 19:23:29 +02:00
tsmith@maint1.mysql.com
9bc15db2d2
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 19:07:59 +02:00
tsmith@maint1.mysql.com
3c331f6be9
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 19:06:06 +02:00
tsmith@quadxeon.mysql.com
2095627468
Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
...
into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
2007-06-15 18:58:07 +02:00
tsmith@maint1.mysql.com
a9ae34b56c
Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50
...
into maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
2007-06-15 18:56:11 +02:00