Commit graph

102 commits

Author SHA1 Message Date
df@pippilotta.erinye.com
dd7185eadd 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-18 20:18:32 +02:00
df@pippilotta.erinye.com
e9387bf5ce 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-06-18 20:15:27 +02:00
df@pippilotta.erinye.com
94a3e239c5 don't use bk cset in commit e-mails 2007-06-18 20:13:33 +02:00
tsmith@quadxeon.mysql.com
918090030b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
2007-06-15 01:57:33 +02:00
df@pippilotta.erinye.com
02f5ba1076 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-13 19:29:13 +02:00
df@pippilotta.erinye.com
f58ca7e057 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-06-13 19:24:46 +02:00
df@pippilotta.erinye.com
35413f161a fix. 2007-06-13 19:23:13 +02:00
df@pippilotta.erinye.com
6de0de60cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
2007-06-13 13:19:43 +02:00
df@pippilotta.erinye.com
f5d6c2906d Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
2007-06-13 12:35:13 +02:00
df@pippilotta.erinye.com
c379f6d99c Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit
2007-06-13 12:04:05 +02:00
df@pippilotta.erinye.com
4f9c468eb9 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commit
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit
2007-06-13 11:54:28 +02:00
df@pippilotta.erinye.com
320ec82616 BK changes for
https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally
2007-06-13 11:44:58 +02:00
msvensson@pilot.(none)
6b80cefbb1 Remove last line, making it possible to merge 2007-06-07 19:59:06 +02:00
msvensson@pilot.blaudden
a7bc5a413e Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
2007-05-15 18:23:36 +02:00
msvensson@pilot.blaudden
a0b1e5406d Add triggers for detecting bad changesets to mysql-5.0 2007-05-15 17:04:31 +02:00
serg@janus.mylan
2141f9f0ee making diff-p-helper obsolete 2007-01-29 18:07:02 +01:00
lars@black.(none)
07ac3d3a95 Merge mysql.com:/home/bk/MERGE/mysql-5.0-merge
into  mysql.com:/home/bk/MERGE/mysql-5.1-merge
2006-11-13 17:59:51 +01:00
lars@mysql.com/black.(none)
7aa562ad20 Merge mysql.com:/home/bk/MERGE/mysql-4.1-merge
into  mysql.com:/home/bk/MERGE/mysql-5.0-merge
2006-11-13 17:54:01 +01:00
aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi
fe5de9f5c3 Correcting BUG/WL identifier extraction to allow multiple references to auxilary
bugs/wls in cset's comments. The targetted BUG's or WL's identifier must be specified
the first in the comments. The referred bugs wls can be typed in same as the targeted
clickable format.
If the the target of the fix is a WL and there are some references to bugs
then the first found reference is regarded as "co-target" so that the bug's identifier
comes up on the subject line along with the WL's and commit mail will update
the bug page. The latter feature can be disarmed (if there is no need to update
the referred bug's page) with typing the first a pseudo-bug pattern (bug#0).

This paticular cset will generate subject line containing bug#0 (as it was the first
referred) whereas the old version would put in the subject line the last referred
pattern (e.g bug#2147483648).
2006-11-12 13:38:13 +02:00
tsmith/tim@siva.hindu.god
394ad97562 BitKeeper/triggers/*crash-protect.pl: Don't print messages if nothing is wrong. 2006-10-25 18:51:50 -06:00
iggy@rolltop.ignatz42.dyndns.org
d7c9784682 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfix
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix
2006-09-14 11:00:38 -04:00
iggy@rolltop.ignatz42.dyndns.org
7c0c57d694 /usr/sbin not always in PATH environment variable. 2006-09-14 10:57:00 -04:00
iggy@rolltop.ignatz42.dyndns.org
eb641f4a43 Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
into  rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
2006-09-13 14:16:53 -04:00
iggy@rolltop.ignatz42.dyndns.org
1cae186141 These bitKeeper changes will allow Windows to be used as a primary development platform. 2006-09-13 14:15:22 -04:00
knielsen@mysql.com
6d40321bac Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1. 2006-06-09 08:40:21 +02:00
knielsen@mysql.com
acf3a19382 Add trigger to protect against changesets from crashed tree 2006-06-08 17:37:43 +02:00
rburnett@production.mysql.com
a630375b32 post-commit:
Small change to enable sending of mails from Windows bk clones
2006-03-13 16:16:46 +01:00
pem@mysql.com
8e0e421943 Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0
into  mysql.com:/usr/home/pem/mysql-5.1-new
2005-12-07 15:17:18 +01:00
lenz@mysql.com
cf7e2b2d6d Merge mysql.com:/space/my/mysql-4.1
into  mysql.com:/space/my/mysql-5.0-merg
2005-12-07 10:40:26 +01:00
lenz@mysql.com
74f44b9b9a Merge mysql.com:/space/my/mysql-4.0
into  mysql.com:/space/my/mysql-4.1
2005-12-07 06:46:43 +01:00
lenz@mysql.com
d4a1aab217 - commit emails are now sent to commits@lists.mysql.com instead of
internals@lists.mysql.com to reduce the noise on the internals list.
2005-12-06 14:07:23 +01:00
lars@mysql.com
1bd55e471e Merging 5.0->5.1 2005-04-19 11:09:54 +02:00
serg@serg.mylan
ea673c1afd Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
2005-04-05 19:52:22 +02:00
serg@serg.mylan
4962ba7f8a merged 2005-04-05 19:44:39 +02:00
serg@serg.mylan
3c3defaa0a add changeset key to the bk commit mail 2005-04-05 15:16:15 +02:00
patg@patrick.local
8e0eb65f9a 5.0 to 5.1 merge 2005-04-01 12:32:17 -08:00
pekka@mysql.com
727015dbb3 Merge 2005-03-28 23:06:19 +02:00
serg@serg.mylan
1ccb9dd214 don't allow to commit as mysqldev 2005-03-18 09:00:46 +01:00
tomas@poseidon.ndb.mysql.com
8e17bedeee Merge 2005-03-08 10:40:52 +01:00
jimw@mysql.com
7eb8c130f7 Merge 2005-02-17 16:16:58 -08:00
jimw@mysql.com
7e499384b4 Merge mysql.com:/home/jimw/my/mysql-4.0-clean
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-02-17 13:46:33 -08:00
jimw@mysql.com
af41813cff Make post-commit trigger not send emails when the message would not contain
any actual changes. (Often the case in merges where the only change involves
renumbering ChangeSet entries.)
2005-02-16 14:03:16 -08:00
igor@rurik.mysql.com
6e06100b0c Manual merge 2005-02-11 18:14:44 -08:00
igor@rurik.mysql.com
e528a1c777 Manual merge 2005-02-11 10:44:03 -08:00
ingo@mysql.com
601a4fdfa2 Merge 2005-02-11 11:59:35 +01:00
jimw@mysql.com
6daef0229c Fix extra blank line in emails sent by post-commit trigger. 2005-02-10 20:31:23 -08:00
jimw@mysql.com
3d265e9777 Merge commit trigger 2005-02-10 14:32:01 -08:00
jimw@mysql.com
c12c5b4e4c Add BUG# to subject and X-Bug header for all outgoing
emails re: bug fixes, and update the URL for the manual
page on installing from the source tree.

Fake bug number for testing: Bug #1234
2005-01-25 12:24:50 -08:00
brian@zim.(none)
6c5b0844ea Merge for 5.0 to 5.1 2005-01-06 14:09:13 -08:00
serg@sergbook.mysql.com
a04fc26c54 manually merged 2004-12-31 15:26:24 +01:00