Commit graph

967 commits

Author SHA1 Message Date
monty@mysql.com
3ecf4de288 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-05 11:38:05 +03:00
ingo@mysql.com
9d9637ea51 Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-05 09:42:20 +02:00
tomas@poseidon.ndb.mysql.com
135f4ab706 ndb: fix compile error 2006-05-05 00:59:27 +02:00
tomas@poseidon.ndb.mysql.com
a9993f11ef ndb: added missing ifdef 2006-05-05 00:33:12 +02:00
serg@sergbook.mysql.com
376117eb98 auto-include plug.in, remove the need for plugins to modify configure.in 2006-05-04 17:14:56 -04: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
jonas@perch.ndb.mysql.com
39e68ea9c8 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-05-04 18:24:14 +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
monty@mysql.com
3ddc1f9956 Merge mysql.com:/home/my/mysql-5.0
into  mysql.com:/home/my/mysql-5.1
2006-05-04 15:58:30 +03: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
ingo@mysql.com
1d72bf877d Merge mysql.com:/home/mydev/mysql-5.1
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-04 10:22:48 +02:00
monty@mysql.com
8f6ed291a7 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/my/mysql-5.1
2006-05-04 01:58:21 +03:00
acurtis@xiphis.org
9d4a065ffd fix include path in windows build 2006-05-03 15:58:16 -07:00
ingo@mysql.com
f9cd0b3d95 Merge mysql.com:/home/mydev/mysql-5.0-bug10405
into  mysql.com:/home/mydev/mysql-5.1-bug10405
2006-05-03 16:39:14 +02:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602)
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
2006-05-03 15:59:17 +03:00
acurtis@xiphis.org
f1d4921139 WL#3201 additional post-review fixes 2006-05-02 04:11:00 -07: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
acurtis@xiphis.org
0736d18337 WL#3201 post-review fixups
end plugin/module naming schizophrenia
  fixup shell code and m4 macro comments
  cmakelists.txt included in EXTRA_DIST
2006-05-01 21:33:09 -07:00
serg@sergbook.mysql.com
281fb1cfc5 make distcheck and cosmetic fixes 2006-04-29 09:33:34 -07:00
mskold@mysql.com
8af6442ead Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
into  mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new-ndb
2006-04-27 15:31:32 +02:00
mskold@mysql.com
92cac65fc1 Added verification test of on-line (non-copying) alter table 2006-04-27 15:13:21 +02:00
jonas@perch.ndb.mysql.com
792535eb23 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
2006-04-27 08:52:20 +02:00
jonas@perch.ndb.mysql.com
0b38b42f96 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-26 17:01:02 +02:00
tomas@poseidon.ndb.mysql.com
f12c6e9940 Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 17:01:00 +02:00
jonas@perch.ndb.mysql.com
6640ffd4d8 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-26 17:01:00 +02:00
aivanov@mysql.com
28e20421b5 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 19:00:57 +04:00
jonas@perch.ndb.mysql.com
b5d12b26a4 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-26 16:24:46 +02:00
jonas@perch.ndb.mysql.com
ca86dcdf83 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
2006-04-26 16:17:27 +02:00
jonas@perch.ndb.mysql.com
e3b4aa2782 ndb - backup 5.0->5.1 merge 2006-04-26 16:11:20 +02:00
jonas@perch.ndb.mysql.com
65a4bc9075 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-26 16:07:02 +02:00
jonas@perch.ndb.mysql.com
705156d0b2 Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-26 15:23:34 +02:00
jonas@perch.ndb.mysql.com
1c9dc67e0e Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-26 15:22:22 +02:00
jonas@perch.ndb.mysql.com
59bced7f8a Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-26 15:16:21 +02:00
jonas@perch.ndb.mysql.com
7641844f9f ndb dd -
fix dirty page handling during opt.nr
2006-04-26 15:15:30 +02:00
aivanov@mysql.com
1c98f3e262 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/innodb/mysql-5.1-ss492
2006-04-26 12:48:12 +04:00
tomas@poseidon.ndb.mysql.com
c1d0294983 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 08:38:50 +02:00
aivanov@mysql.com
0eb36757a8 Applied innodb-5.1-ss492 snapshot.
* Fix BUG#19217 "dict_load_indexes() may read the delete-mark incorrectly".
 * Remove obsolete and unused variables from srv0srv.c.
 * Remove srv_sys->operational since it is unused.
 * Make thread_id parameter in os_thread_create() optional.
 * Add platform-specific os_thread_ret_t and OS_THREAD_DUMMY_RETURN,
   and convert thread start functions to use them.
2006-04-26 08:30:37 +04:00
tomas@poseidon.ndb.mysql.com
0e8ccc1bee Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-04-26 01:13:16 +02:00
kent@mysql.com
3e2cc998a6 Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-new
2006-04-25 22:40:04 +02:00
aelkin@mysql.com
3363effa52 Merge mysql.com:/home/elkin/MySQL/BARE/5.0
into  mysql.com:/home/elkin/MySQL/MERGE/5.1-new
2006-04-25 20:05:15 +03:00
jonas@perch.ndb.mysql.com
44b4ec392e Merge perch.ndb.mysql.com:/home/jonas/src/51-work
into  perch.ndb.mysql.com:/home/jonas/src/51-jonas
2006-04-25 17:02:52 +02:00
jonas@perch.ndb.mysql.com
e8797b49d2 Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
2006-04-25 17:02:49 +02:00
jonas@perch.ndb.mysql.com
c19ab931c6 ndb -
Fix bootstrap/compile error
2006-04-25 17:02:48 +02:00
jonas@perch.ndb.mysql.com
4e9c9e2f14 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
2006-04-25 17:02:47 +02:00
tomas@poseidon.ndb.mysql.com
fde6059554 ndb_restore: more compatablitity checks 2006-04-25 17:02:46 +02:00
jonas@perch.ndb.mysql.com
76b666e299 Merge perch.ndb.mysql.com:/home/jonas/src/50-work
into  perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-25 16:31:21 +02:00
jonas@perch.ndb.mysql.com
4c3abf617a ndb -
Fix so that testDict can use/handle disk tables
2006-04-25 16:30:44 +02:00