Commit graph

29584 commits

Author SHA1 Message Date
knielsen@mysql.com
2ad568d421 Merge bk-internal:/home/bk/mysql-5.1-new
into  mysql.com:/usr/local/mysql/mysql-5.1-relmerge
2006-01-17 18:35:16 +01:00
tomas@poseidon.ndb.mysql.com
b3658d6731 fix my_compress/zlib link error 2006-01-17 18:35:15 +01:00
joerg@mysql.com
3d3c9ba4fa Merge mysql.com:/M51/clone-5.1 into mysql.com:/M51/mysql-5.1 2006-01-17 18:35:14 +01:00
joerg@mysql.com
be46467b1f Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/M51/mysql-5.1
2006-01-17 18:35:12 +01:00
tomas@poseidon.ndb.mysql.com
246cccc1a5 fix compile error 2006-01-17 18:35:11 +01:00
tomas@poseidon.ndb.mysql.com
933a87a943 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-17 18:35:10 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
fb79504889 Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2747-push
2006-01-17 12:35:09 -05:00
tomas@poseidon.ndb.mysql.com
368f4d86e3 fix some options to ndb tools that seem to be disturbing some shells 2006-01-17 17:22:04 +01:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
0f74283ba1 Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 11:22:03 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
a9ab4f9cb8 Fix for auto-partitioned tables and PARTITION BY KEY() tables 2006-01-17 11:19:48 -05:00
pappa@c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se
b809a9d027 Merge c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1-new
into  c-0c0be253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/wl2604-push
2006-01-17 09:36:55 -05:00
joerg@mysql.com
728c67466d Manual merge of 5.1.5 build changes into the general tree. 2006-01-17 13:32:28 +01:00
tomas@poseidon.ndb.mysql.com
6ccfda09c9 added missing setting of ndb environment variables used in tests 2006-01-17 10:48:47 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
6bf5c9113d WL #2747: Fix such that backup and restore works for user defined
partitioned tables in NDB
2006-01-17 09:25:12 +01:00
mikron@c-1e0be253.1238-1-64736c10.cust.bredbandsbolaget.se
e802a94284 WL #2604: Partition Management
Optimised version of ADD/DROP/REORGANIZE partitions for
non-NDB storage engines.
New syntax to handle REBUILD/OPTIMIZE/ANALYZE/CHECK/REPAIR partitions
Quite a few bug fixes
2006-01-17 08:40:00 +01:00
tomas@poseidon.ndb.mysql.com
9d4882d51d added option to run all ndb tests only 2006-01-17 08:25:52 +01:00
tomas@poseidon.ndb.mysql.com
31596d5456 added assert for when ndb share is not released as it should
+ corrected the bugs in this resuling from mysql-test-run
+removed some debug printouts
2006-01-17 07:36:50 +01:00
tomas@poseidon.ndb.mysql.com
f569266bfa Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-16 22:48:57 +01:00
tomas@poseidon.ndb.mysql.com
0d8ed9ba04 added option to force ndb to be run for all tests 2006-01-16 22:47:19 +01:00
reggie@linux.site
3573c2cf47 Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  linux.site:/home/reggie/work/mysql-5.1-bug15968
2006-01-16 15:23:29 -06:00
svoj@april.(none)
74c475b23d Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  april.(none):/home/svoj/devel/mysql/BUG14194/mysql-5.1-new
2006-01-16 22:27:36 +04:00
svoj@april.(none)
237e80670a Merge april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.0
into  april.(none):/home/svoj/devel/mysql/BUG13835/mysql-5.1-new
2006-01-16 21:42:09 +04:00
evgen@moonbone.local
c435433c61 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into moonbone.local:/work/15347-bug-5.1-new-mysql
2006-01-16 19:01:57 +03:00
knielsen@mysql.com
cceb3ed1d7 Merge mysql.com:/usr/local/mysql/mysql-5.x-win-test-fixes
into  mysql.com:/usr/local/mysql/mysql-5.1-win-test-fixes
2006-01-16 16:04:53 +01:00
knielsen@mysql.com
1b75cf8aa6 Two minor fixes to be able to run tests from within a Windows Max
build directory.
2006-01-16 15:25:15 +01:00
evgen@moonbone.local
7f0aa55e36 Manually merged 2006-01-16 16:57:15 +03:00
jonas@perch.ndb.mysql.com
068557b294 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
2006-01-16 13:15:12 +01:00
tomas@poseidon.ndb.mysql.com
f9a1f53fe8 disabled.def:
disabling ndb_autodiscover for now.  Removing frm's causes problems for cluster binlog
2006-01-16 13:15:11 +01:00
jonas@perch.ndb.mysql.com
47581fa7fa ndb - fix ndb_restore on solaris
Fix alignment changes in tup page header
2006-01-15 20:45:10 +01:00
jonas@perch.ndb.mysql.com
b42ea76770 Merge perch.ndb.mysql.com:/home/jonas/src/51-ndb
into  perch.ndb.mysql.com:/home/jonas/src/51-new
2006-01-15 20:45:09 +01:00
jonas@eel.(none)
93bfec6297 ndb dd -
Change default page buffer cache size
2006-01-15 20:45:08 +01:00
aivanov@mysql.com
55d77bdc36 Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alexi/dev/mysql-5.1-studio
2006-01-15 17:41:32 +03:00
aivanov@mysql.com
8e499f0292 Changes to avoid compilation errors in MS Visual Studio 7.1
(reviewed by Mats)
2006-01-15 15:47:27 +03:00
knielsen@mysql.com
ae9c76b9cb Solaris compile fixes. 2006-01-14 11:06:44 +01:00
knielsen@mysql.com
12cb3f4c5e Windows/Visual Studio 2003 fixes for the 5.1.5 release. 2006-01-13 22:09:48 +01:00
svoj@april.(none)
4426d2ea30 BUG#14194: Problem with fulltext boolean search and apostrophe
Fixed that single apostrophe was considered as a word character.
2006-01-13 23:34:38 +04:00
svoj@april.(none)
5581ef960a BUG#13835: max key length is 1000 bytes when trying to create a fulltext index
Allow fulltext index on VARCHAR columns longer than max key length.
2006-01-13 21:25:12 +04:00
pekka@mysql.com
1c6fd0ee8b Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/space/pekka/ndb/version/my51
2006-01-13 18:08:59 +01:00
pekka@mysql.com
d952e3e339 ndb - wl#2972 event merge false by default => change option name 2006-01-13 18:02:43 +01:00
anozdrin@mysql.com
4e1ccbe244 Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15103
into  mysql.com:/home/alik/MySQL/devel/5.1-tree
2006-01-13 19:46:39 +03:00
anozdrin@mysql.com
acbacd921f Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:46:38 +03:00
tomas@poseidon.ndb.mysql.com
f4bb80b691 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-13 17:46:37 +01:00
tomas@poseidon.ndb.mysql.com
fb52fe5cf5 fix compile error on hp-ux setenv->putenv
print slave port as well
2006-01-13 17:44:37 +01:00
anozdrin@mysql.com
b1705ae5c4 Merge BUG#15110 from 5.0 into 5.1.
Merge mysql.com:/home/alik/MySQL/devel/5.0-bug15110
into  mysql.com:/home/alik/MySQL/devel/5.1-bug15110
2006-01-13 19:09:27 +03:00
evgen@moonbone.local
ceb1932984 Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0
into moonbone.local:/work/15347-bug-5.0-mysql
2006-01-13 18:42:15 +03:00
evgen@moonbone.local
cea01c7387 Merge 2006-01-13 16:27:38 +03:00
bar@mysql.com
0e2fac2d8c Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/usr/home/bar/mysql-5.0
2006-01-13 17:21:38 +04:00
bar@mysql.com
949aced164 Merge mysql.com:/usr/home/bar/mysql-4.1.b15377
into  mysql.com:/usr/home/bar/mysql-5.0
2006-01-13 16:39:33 +04:00
bar@mysql.com
977731b3fc Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into  mysql.com:/usr/home/bar/mysql-4.1.b15377
2006-01-13 16:21:44 +04:00
tomas@poseidon.ndb.mysql.com
21008ab2e8 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
2006-01-13 13:02:20 +01:00