Commit graph

51770 commits

Author SHA1 Message Date
tomas@whalegate.ndb.mysql.com
2a01585422 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-12-11 21:02:29 +01:00
tomas@whalegate.ndb.mysql.com
5e9c092c5d move randomly failing tests to ndb_team suite 2007-12-11 19:57:26 +01:00
tomas@whalegate.ndb.mysql.com
8819e1733d add capability to run certain testsuites optionally depending on name of clone 2007-12-11 19:52:35 +01:00
tomas@whalegate.ndb.mysql.com
fe46b09e3e remove memleak cased by dynamic variables being lost 2007-12-11 19:51:44 +01:00
df@pippilotta.erinye.com
bcb3c304ff 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-12-11 17:41:11 +01:00
df@pippilotta.erinye.com
de716f1f86 No we're still at 5.0.54. 2007-12-11 17:38:49 +01:00
tomas@whalegate.ndb.mysql.com
ddc2ee655f Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-12-11 16:08:52 +01:00
tomas@whalegate.ndb.mysql.com
824d17ba77 bug#33142: access after free() for blob replication and online alter table 2007-12-11 16:04:33 +01:00
tomas@whalegate.ndb.mysql.com
2477f7acb6 compile error fix for osx 2007-12-11 15:19:37 +01:00
tomas@whalegate.ndb.mysql.com
48c509a2aa bug#32759 already fixed 2007-12-11 15:08:00 +01:00
mskold/marty@quadfish.(none)
a452347893 Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-12-11 11:54:46 +01:00
mskold/marty@mysql.com/quadfish.(none)
4f8101c863 Enabled test rpl_ndb_ddl 2007-12-11 11:51:14 +01:00
tomas@whalegate.ndb.mysql.com
e56c24d45f Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/cge-5.1
2007-12-11 11:43:12 +01:00
tomas@whalegate.ndb.mysql.com
9a189642e7 remoce compiler warnings 2007-12-11 11:41:19 +01:00
tomas@whalegate.ndb.mysql.com
57c890d501 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 13:32:19 +01:00
tomas@whalegate.ndb.mysql.com
4740565ebb backport test for bug#30674
(bug not present in 5.1)
2007-12-10 13:29:23 +01:00
df@pippilotta.erinye.com
ffa270d616 after-merge fix 2007-12-10 12:21:02 +01:00
df@pippilotta.erinye.com
42945c7726 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-12-10 12:16:41 +01:00
df@pippilotta.erinye.com
a079cb9f49 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 12:02:02 +01:00
df@pippilotta.erinye.com
9455fafe1b 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-12-10 10:53:44 +01:00
df@pippilotta.erinye.com
efd74cb680 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 10:52:05 +01:00
df@pippilotta.erinye.com
3f79b0f108 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-12-10 10:46:00 +01:00
df@pippilotta.erinye.com
45c93a5866 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 10:42:58 +01:00
df@pippilotta.erinye.com
353cd3300a Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-build
2007-12-10 10:41:34 +01:00
tomas@whalegate.ndb.mysql.com
53dabdd38c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 10:35:03 +01:00
tomas@whalegate.ndb.mysql.com
541db60153 Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 10:32:21 +01:00
tomas@whalegate.ndb.mysql.com
ddbb4d425c Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-10 10:31:51 +01:00
tomas@whalegate.ndb.mysql.com
9eb0ef8914 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
2007-12-10 10:26:01 +01:00
tomas@whalegate.ndb.mysql.com
ae7d4929e0 Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb-merge
2007-12-10 10:20:52 +01:00
tsmith@ramayana.hindu.god
31a4940b3f Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 15:04:45 -07:00
tsmith@ramayana.hindu.god
4eb097ba12 Add a way to remove options which mysql-test-run.pl no longer uses. 2007-12-07 14:43:31 -07:00
mleich@five.local.lan
4fc04761b9 Merge five.local.lan:/work/merge/mysql-5.1-build
into  five.local.lan:/work/merge/mysql-5.1-build-parts
2007-12-07 18:45:09 +01:00
joerg@trift2.
72e382ecc7 Merge trift2.:/MySQL/M51/embedtest-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-12-07 15:02:31 +01:00
joerg@trift2.
151504a3d0 Makefile.am
Makefile syntax error, comment should precede the whole target.
2007-12-07 14:46:52 +01:00
mskold/marty@mysql.com/quadfish.(none)
0c62882776 Removed illegal cast 2007-12-07 14:06:44 +01:00
mskold/marty@quadfish.(none)
9532e822f1 Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-12-07 14:04:58 +01:00
mskold/marty@mysql.com/quadfish.(none)
4619caa5d5 Removed illegal cast 2007-12-07 14:03:54 +01:00
joerg@trift2.
74799dc453 Merge trift2.:/MySQL/M50/push-5.0
into  trift2.:/MySQL/M51/push-5.1
2007-12-07 13:54:56 +01:00
joerg@trift2.
fd5000f650 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-12-07 13:51:41 +01:00
mskold/marty@quadfish.(none)
844936abdc Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndb
into  mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb
2007-12-07 13:45:01 +01:00
mskold/marty@mysql.com/quadfish.(none)
6047fb2e44 Removed illegal cast 2007-12-07 13:42:44 +01:00
joerg@trift2.
5a40e40946 Merge trift2.:/MySQL/M51/embedtest-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-12-07 12:35:56 +01:00
joerg@trift2.
cc609742fa Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-12-07 12:33:48 +01:00
mskold/marty@mysql.com/quadfish.(none)
4dcfb096d7 bug#21072 Duplicate key error in NDB references wrong key: regenerated result 2007-12-07 12:20:04 +01:00
tsmith@ramayana.hindu.god
3b45ef82dd Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 03:59:53 -07:00
tsmith@ramayana.hindu.god
3d01ffd78d Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-12-07 03:56:03 -07:00
joerg@trift2.
2cf168d6aa Makefile.am
In the "test-bt" target, replace the call "$(MAKE) test-embedded" by the actions of that target.
2007-12-07 11:54:59 +01:00
tsmith@ramayana.hindu.god
8c5f194505 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:51:23 -07:00
tsmith@ramayana.hindu.god
04d363d1f6 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51-merge
2007-12-07 03:42:39 -07:00
tsmith@ramayana.hindu.god
bf6292ea97 Merge ramayana.hindu.god:/home/tsmith/m/bk/maint/41
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-12-07 03:40:18 -07:00