Commit graph

78 commits

Author SHA1 Message Date
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
serg@serg.mylan
9f94a42fcc BitKeeper/triggers/pre-delta
don't checkin for Administrator or mysqldev
sql/log.cc@1.157
    restored a bugfix that was lost in a merge
2004-12-22 22:59:19 +01:00
monty@mysql.com
afbe601302 merge with 4.1 2004-10-29 19:26:52 +03:00
mwagner@here.mwagner.org
06245b4508 post-commit:
Added catch for (example) WL#1234 into bk commit subjects
2004-10-12 15:08:58 -05:00
pem@mysql.com
dfd59e296e Merge 4.1 -> 5.0. 2004-04-07 19:07:44 +02:00
serg@serg.mylan
7652c904c7 correct test in trigger 2004-04-02 22:31:31 +02:00
serg@serg.mylan
0c1d34a81d trying pre-delta trigger 2004-04-02 22:12:39 +02:00
serg@serg.mylan
9bf7e07b75 version updated after merge :) 2004-03-26 12:36:57 +01:00
monty@mysql.com
e0e0314d60 Merge with 4.0 2004-03-25 23:29:45 +02:00
serg@serg.mylan
755c068ff9 bugs-aware post-commit trigger
cleanup (VERSION variable)
2004-03-25 13:29:12 +01:00
serg@serg.mylan
d8a9a8267b shared IO_CACHE: protection against remove_io_share in a wrong time
bug#3134
2004-03-25 11:22:01 +01:00
bell@sanja.is.com.ua
ad05bbf48c version fixed 2004-03-03 22:18:18 +02:00
pem@mysql.com
28a2c6a96b Merging 4.1->5.0. 2003-11-19 15:19:46 +01:00
monty@narttu.mysql.fi
4e4725377d Merge with 4.0 2003-11-04 09:40:36 +02:00
serg@serg.mylan
72d00ef0c2 cleanup 2003-10-25 22:43:19 +02:00
pem@mysql.com
fb548cbc6d Put username in the Subject line as well (with the changeset number). 2003-10-23 15:24:48 +02:00
pem@mysql.telia.com
9c3a7a6ba3 Merge 4.1 into 5.0 (first pass). 2003-07-08 17:50:23 +02:00
serg@sergbook.mylan
242ee84fb9 triggers magic
enforce REAL_EMAIL
2003-06-18 14:12:50 +02:00
pem@mysql.com
0db8b774ad Post merge fix. 2002-12-08 15:17:40 +01:00
monty@mashka.mysql.fi
859b688476 Merge with 4.0.6 2002-12-05 19:38:42 +02:00
pem@mysql.com
130e00ef5e A better way to get the ChangeSet revision for the Subject: line. 2002-11-28 12:45:01 +01:00
pem@mysql.com
608ab49eff Add the ChangeSet id to Subject: in all emails. 2002-11-27 13:01:50 +01:00
mwagner@work.mysql.com
18d6d83c0a configure.in Updated for 5.0
post-commit	Updated for 5.0
post-commit	Removed truncate for commits to internal lists (for complete code reviews)
2002-10-04 09:34:58 +02:00
monty@narttu.mysql.fi
7134ffec21 Merge with 4.0.3
Some simple optimzations, more comments and indentation changes.
Add ` around database in 'use database' in binary log.
Moved max_error_count and max_warning_count to variables struct.
Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls.
Changed string functions to use character set of first string argument as default return characterset
(Each string function can change the above assumption if needed)
2002-08-30 12:40:40 +03:00
arjen@fred.bitbike.com
e6f4e3939b merge 2002-08-15 15:09:51 +10:00