Commit graph

33705 commits

Author SHA1 Message Date
tomas@poseidon.ndb.mysql.com
44acdaac39 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 23:22:54 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:55:12 +02:00
tomas@poseidon.ndb.mysql.com
a54c863366 Merge jonas@perch:/home/jonas/src/51-work
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:02:36 +02:00
acurtis@xiphis.org
1a5c828cf2 Bug#19536
"NDB replication fails when no explicit--binlog-format given"
  fix initialization, storage engine initialization must occur after
  logging type is configured
2006-05-04 10:26:10 -07:00
tomas@poseidon.ndb.mysql.com
f67be8de63 ndb: now no difference in behaviour between row and statement based 2006-05-04 18:26:36 +02:00
jonas@perch.ndb.mysql.com
851132fb50 ndb dd -
fix buglet when nr-delete-op gets page fault
2006-05-04 18:22:16 +02:00
jonas@perch.ndb.mysql.com
bdb13878d3 ndb dd -
Fix bug where page is read, modified and then transaction abort
  and then puge is flushed causing lsn on page to be 0
2006-05-04 16:01:37 +02:00
jonas@perch.ndb.mysql.com
0764e94dad ndb dd - Impl. support for using delayed page request, to simulate "full" page buffer cache 2006-05-04 15:58:15 +02:00
tomas@poseidon.ndb.mysql.com
7fe2ab3f2c ndb:
stilled small memleak
+ changed clear/init indexes code a litter
2006-05-04 15:55:38 +02:00
tomas@poseidon.ndb.mysql.com
37e8b5ac06 removing the usage if the ndb local dict cache to adress the 241 errors we get now and then 2006-05-04 13:58:17 +02:00
mikael@zim.(none)
d98fe8b724 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug19313
2006-05-03 15:58:20 -07:00
kent@mysql.com
55ccf0fe87 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-04 00:58:19 +02:00
kent@mysql.com
34a37aedfc Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old02
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-05-04 00:58:18 +02:00
jimw@mysql.com
6978a51832 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-03 15:58:17 -07:00
acurtis@xiphis.org
9d4a065ffd fix include path in windows build 2006-05-03 15:58:16 -07:00
jimw@mysql.com
da9a11669d Merge mysql.com:/home/jimw/my/mysql-4.1-wl2852
into  mysql.com:/home/jimw/my/mysql-5.1-clean
2006-05-03 15:58:16 -07:00
acurtis@xiphis.org
16d8d6bcca fix legacy configure option handling 2006-05-03 15:58:15 -07:00
cmiller@zippy.(none)
7bbd8fb051 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
2006-05-03 18:58:13 -04:00
acurtis@xiphis.org
3954c72207 Merge acurtis@bk-internal:/home/bk/mysql-5.1-new
into  xiphis.org:/home/antony/work2/wl3201-final
2006-05-03 15:58:12 -07:00
aivanov@mysql.com
2038e05bb4 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/dev/mysql-5.1-wl3148
2006-05-04 02:58:11 +04:00
aivanov@mysql.com
5b20ee67db Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1
2006-05-04 02:26:57 +04:00
aivanov@mysql.com
ac0ac6a3c9 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
into  mysql.com:/home/alexi/innodb/mysql-5.1
2006-05-04 00:35:45 +04:00
aivanov@mysql.com
4cff042a58 Applied innodb-5.0-ss521 snapshot.
Fixed BUG#19366: "consistent_snapshot.test fails".
2006-05-04 00:32:34 +04:00
aivanov@mysql.com
2f190c2c10 Merge mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
into  mysql.com:/home/alexi/innodb/mysql-5.1
 Null-merge.
2006-05-03 23:31:52 +04:00
aivanov@mysql.com
a7122276a4 Merge mysql.com:/home/alexi/innodb/mysql-4.1-ss26-work
into  mysql.com:/home/alexi/innodb/mysql-5.0-ss521-work
 Null-merge.
2006-05-03 23:29:27 +04:00
aivanov@mysql.com
d546f0d93e Applied innodb-4.1-ss26 snapshot.
Fixed BUG#19366: "consistent_snapshot.test fails".
2006-05-03 23:25:01 +04:00
cmiller@zippy.(none)
b07bb71291 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
2006-05-03 10:04:04 -04:00
cmiller@zippy.(none)
a5789854ee Added code to remove closing comment code from event text, as would be
supplied inside a  /*!VERSION event-text */  segment.  (Fixes Bug#18078
2006-05-03 09:55:34 -04:00
serg@sergbook.mysql.com
375d3e8258 Fixed dependency checking 2006-05-03 09:46:19 -04:00
mikael@zim.(none)
fdb8043efe Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zim.(none):/home/mikael/bug19313
2006-05-03 01:04:14 -07:00
bar@mysql.com
c51d7419e8 Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
2006-05-03 12:34:51 +05:00
knielsen@mysql.com
4ba1a4b3cd Windows build fixes for CMake 2006-05-03 09:06:22 +02:00
bar@mysql.com
467052aa5b Merge mysql.com:/usr/home/bar/mysql-5.1-new
into  mysql.com:/usr/home/bar/mysql-5.1-new.b18170
2006-05-03 09:08:12 +05:00
cmiller@zippy.(none)
9648920963 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078
2006-05-02 18:41:42 -04:00
pekka@mysql.com
2b25349820 pekka:get - push push push 2006-05-02 21:47:53 +02:00
dlenev@mysql.com
5cae540501 Merge mysql.com:/home/dlenev/mysql-5.0-bg11081
into  mysql.com:/home/dlenev/mysql-5.1-merges
2006-05-02 23:16:53 +04:00
cmiller@zippy.(none)
ba0752e125 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
2006-05-02 15:09:35 -04:00
cmiller@zippy.(none)
d71f198333 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
2006-05-02 15:08:47 -04:00
aivanov@mysql.com
f6073b2735 WL#3148: Modifying sizes of i_s.processlist columns ('time', 'info'). 2006-05-02 23:08:22 +04:00
cmiller@zippy.(none)
5de7b78bd2 More merging assistence.
Logging behavior changed in early 5.1.  (The filename was never right, but
the "opt" file is unnecessary in 5.0 anyway.)
2006-05-02 15:07:00 -04:00
acurtis@xiphis.org
20b687ce0d WL#3201 post-review fixups 2006-05-02 12:04:20 -07:00
cmiller@zippy.(none)
230b52a835 Manually merged 2006-05-02 13:56:43 -04:00
cmiller@zippy.(none)
4d15fc5ee0 Merge zippy.(none):/home/cmiller/work/mysql/mysql-5.0__bug17667
into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug17667
2006-05-02 13:55:03 -04:00
cmiller@zippy.(none)
0f63c3d39c An update to as-yet unused new feature of snprintf, which was added to bring
our sprintf()-alike in sync with our fprintf()-alike features.
2006-05-02 13:42:35 -04:00
elliot@mysql.com
c0b5b3cd40 Fix spelling in comments as requested by Osku
This will make charset code easier to understand
2006-05-02 09:13:58 -04:00
dlenev@mysql.com
c40f8557dc Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/dlenev/mysql-5.0-bg11081
2006-05-02 17:07:23 +04:00
gluh@eagle.intranet.mysql.r18.ru
19de86dd63 WL#2257 REFERENTIAL_CONSTRAINTS view
added I_S.REFARENTIAL_CONSTRAINTS table
2006-05-02 16:31:39 +05:00
acurtis@xiphis.org
f1d4921139 WL#3201 additional post-review fixes 2006-05-02 04:11:00 -07:00
knielsen@mysql.com
f0341ac431 Fix a bunch of non-Linux compile failures. 2006-05-02 09:19:54 +02:00
acurtis@xiphis.org
09c7374d69 Merge xiphis.org:/home/antony/work2/mysql-5.1
into  xiphis.org:/home/antony/work2/wl3201-post-review.2
2006-05-01 22:45:31 -07:00