summaryrefslogtreecommitdiff
path: root/BitKeeper/triggers
Commit message (Collapse)AuthorAgeFilesLines
* Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-06-181-2/+2
|\ | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BitKeeper/triggers/post-commit: Auto merged
| * Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-06-181-2/+2
| |\ | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build BitKeeper/triggers/post-commit: Auto merged
| | * don't use bk cset in commit e-mailsunknown2007-06-181-2/+2
| | |
* | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-06-151-22/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51 configure.in: Auto merged BitKeeper/deleted/.del-ctype_cp932_notembedded.test~3047e508460cef42: Auto merged mysql-test/extra/binlog_tests/binlog.test: Auto merged mysql-test/extra/binlog_tests/blackhole.test: Auto merged mysql-test/extra/binlog_tests/ctype_cp932_binlog.test: Auto merged mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: Auto merged mysql-test/extra/binlog_tests/drop_temp_table.test: Auto merged mysql-test/extra/binlog_tests/insert_select-binlog.test: Auto merged mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/binlog_stm_binlog.result: Auto merged mysql-test/r/binlog_stm_mix_innodb_myisam.result: Auto merged mysql-test/r/have_log_bin.require: Auto merged mysql-test/t/flush_block_commit_notembedded.test: Auto merged mysql-test/t/insert_update.test: Auto merged mysql-test/t/mysqlbinlog-cp932.test: Auto merged mysql-test/t/mysqlbinlog2.test: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/ps.test: Auto merged mysql-test/t/sp_trans.test: Auto merged sql/handler.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/r/date_formats.result: Use local mysql-test/r/partition.result: SCCS merged mysql-test/t/date_formats.test: Use local mysql-test/t/ndb_basic.test: manual merge mysql-test/t/partition.test: manual merge mysql-test/t/user_var-binlog.test: use local
| * \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-06-131-4/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build BitKeeper/triggers/post-commit: Auto merged
| | * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-06-131-4/+6
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build BitKeeper/triggers/post-commit: Auto merged
| | | * fix.unknown2007-06-131-4/+6
| | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: send to correct address.
| | * | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitunknown2007-06-131-22/+18
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
| * | \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commitunknown2007-06-131-22/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commitunknown2007-06-131-22/+18
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-post-commit BitKeeper/triggers/post-commit: SCCS merged
| | | * | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-post-commitunknown2007-06-131-22/+18
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-post-commit BitKeeper/triggers/post-commit: Remove dev-public@ / dev-bugs@ e-mail, is now handled differently. Merge fix for 5.0.
| | | | * | BK changes forunknown2007-06-131-21/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://inside.mysql.com/wiki/MySQL's_Code_Reviews_Published_Externally BitKeeper/triggers/post-commit: 1) Add additional method of detecting merge changesets. 2) Remove code sending e-mail to dev-public@ or dev-bugs@. 3) Change code sending e-mail to commits@ to send to dev-private@ if a specific file is present in the BK root directory, denoting this tree as private.
* | | | | | Remove last line, making it possible to mergeunknown2007-06-071-1/+0
|/ / / / /
* | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maintunknown2007-05-152-0/+2
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint BitKeeper/deleted/.del-pre-outgoing.crash-protect.pl: Delete: BitKeeper/triggers/pre-outgoing.crash-protect.pl BitKeeper/deleted/.del-pre-resolve.crash-protect.pl: Delete: BitKeeper/triggers/pre-resolve.crash-protect.pl
| * | | Add triggers for detecting bad changesets to mysql-5.0unknown2007-05-152-0/+164
| |/ /
* | | making diff-p-helper obsoleteunknown2007-01-291-1/+1
| | |
* | | Merge mysql.com:/home/bk/MERGE/mysql-5.0-mergeunknown2006-11-131-3/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.1-merge BitKeeper/triggers/post-commit: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged sql/log_event.h: Auto merged sql/sql_repl.cc: Auto merged sql/slave.cc: Manual merge
| * | Merge mysql.com:/home/bk/MERGE/mysql-4.1-mergeunknown2006-11-131-3/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/bk/MERGE/mysql-5.0-merge BitKeeper/triggers/post-commit: Auto merged mysql-test/t/func_gconcat.test: Auto merged sql/item_sum.cc: Auto merged sql/sql_repl.cc: Auto merged sql/log_event.h: Manual merge sql/slave.cc: Manual merge
| | * Correcting BUG/WL identifier extraction to allow multiple references to auxilaryunknown2006-11-121-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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). BitKeeper/triggers/post-commit: fixing greedyness of old extraction
* | | BitKeeper/triggers/*crash-protect.pl: Don't print messages if nothing is wrong.unknown2006-10-252-8/+0
| | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/pre-outgoing.crash-protect.pl: Don't print message if nothing is wrong. BitKeeper/triggers/pre-resolve.crash-protect.pl: Don't print message if nothing is wrong.
* | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my50-bksendmailfixunknown2006-09-141-3/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into rolltop.ignatz42.dyndns.org:/mnt/storeage/bksendmailfix/my51-bksendmailfix BitKeeper/triggers/post-commit: SCCS merged
| * | /usr/sbin not always in PATH environment variable.unknown2006-09-141-3/+9
| | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Attempt to default to /usr/sbin/sendmail if it exists, otherwise use sendmail.
* | | Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfixunknown2006-09-131-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix BitKeeper/etc/ignore: auto-union BitKeeper/triggers/post-commit: Manual merge. Opted for the method that uses temp files for improved troubleshooting.
| * | These bitKeeper changes will allow Windows to be used as a primary ↵unknown2006-09-131-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | development platform. BitKeeper/etc/ignore: Exclude files created during the Windows build process. BitKeeper/triggers/post-commit: post-commit trigger writes emails to file in the BitKeeper/tmp directory before sending in case of failure. Now uses bk sendmail instead of hardcoded /usr/sbin/sendmail to send message.
* | | Loosen up crashed repo check a bit to allow merging 5.0 -> 5.1.unknown2006-06-092-66/+2
| | |
* | | Add trigger to protect against changesets from crashed treeunknown2006-06-082-0/+234
| | |
* | | post-commit:unknown2006-03-131-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Small change to enable sending of mails from Windows bk clones BitKeeper/triggers/post-commit: Small change to enable sending of mails from Windows bk clones
* | | Merge mysql.com:/usr/home/pem/bug14834/mysql-5.0unknown2005-12-071-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/pem/mysql-5.1-new BitKeeper/triggers/post-commit: Merge. configure.in: Manual merge. mysql-test/r/sp.result: Merge. mysql-test/r/view.result: Merge. sql/share/errmsg.txt: Manual merge. sql/sp_head.cc: Merge. sql/sql_parse.cc: Merge. sql/sql_table.cc: Merge. sql/sql_yacc.yy: Merge.
| * | Merge mysql.com:/space/my/mysql-4.1unknown2005-12-071-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-merg BitKeeper/triggers/post-commit: Auto merged
| | * Merge mysql.com:/space/my/mysql-4.0unknown2005-12-071-4/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1 BitKeeper/triggers/post-commit: Auto merged
| | | * - commit emails are now sent to commits@lists.mysql.com instead of unknown2005-12-061-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | internals@lists.mysql.com to reduce the noise on the internals list.
* | | | Merging 5.0->5.1unknown2005-04-191-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged mysql-test/r/grant.result: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/Makefile.am: Auto merged sql/log.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged
| * | | Merge serg.mylan:/usr/home/serg/Abk/mysql-4.1unknown2005-04-051-0/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 BitKeeper/triggers/post-commit: Auto merged
| | * | mergedunknown2005-04-051-0/+3
| | |\ \ | | | |/
| | | * add changeset key to the bk commit mailunknown2005-04-051-0/+3
| | | |
* | | | 5.0 to 5.1 mergeunknown2005-04-011-0/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/grant.result: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/Makefile.am: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_parse.cc: Auto merged configure.in: merge of 5.0 to 5.1, version info and NDB_VERSION_() conflicts libmysqld/Makefile.am: merge of Makefile sql_sources list sql/sql_acl.h: merge, no need to hand resolve BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Mergeunknown2005-03-281-0/+11
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysqltest.c: Auto merged BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Auto merged myisam/mi_create.c: Auto merged mysql-test/r/grant2.result: Auto merged mysql-test/r/metadata.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/type_enum.result: Auto merged mysql-test/t/grant2.test: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged ndb/src/kernel/blocks/dbacc/Dbacc.hpp: SCCS merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: SCCS merged sql/sql_union.cc: DBUG_ASSERT(TRUE) is useless so assume opposite
| | * | don't allow to commit as mysqldevunknown2005-03-181-0/+11
| | | |
* | | | Mergeunknown2005-03-081-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged configure.in: Auto merged scripts/mysql_create_system_tables.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged scripts/mysql_fix_privilege_tables.sql: SCCS merged
| * | | Merge for 5.0 to 5.1unknown2005-01-061-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Merge for 5.0 -> 5.1 configure.in: Merge for 5.0 -> 5.1 mysql-test/r/grant.result: Merge for 5.0 -> 5.1 scripts/mysql_create_system_tables.sh: Merge for 5.0 -> 5.1 scripts/mysql_fix_privilege_tables.sql: Merge for 5.0 -> 5.1 sql/sql_acl.cc: Merge 5.0 -> 5.1 sql/sql_acl.h: Merge 5.0 -> 5.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | | version fixedunknown2004-03-031-1/+1
| | | | |
* | | | | Mergeunknown2005-02-171-0/+7
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/system_mysql_db.result: Update results scripts/mysql_create_system_tables.sh: Merge fix for Bug #7617, making enum fields in grant tables case-insensitive. scripts/mysql_fix_privilege_tables.sql: Merge fix for Bug #7617, and fix additional enum/set columns. sql/sql_acl.cc: Hand-merge due to whitespace change sql/sql_lex.cc: Hand-merge bug fix.
| * | | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-02-171-0/+7
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean BitKeeper/triggers/post-commit: Auto merged
| | * | | Make post-commit trigger not send emails when the message would not containunknown2005-02-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any actual changes. (Often the case in merges where the only change involves renumbering ChangeSet entries.) BitKeeper/triggers/post-commit: Suppress emails when there's no changes actually reported
* | | | | Manual mergeunknown2005-02-111-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/select.result: Auto merged
| * | | | Manual mergeunknown2005-02-111-1/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged sql/table.cc: Auto merged
| | * | | Fix extra blank line in emails sent by post-commit trigger.unknown2005-02-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Remove extra blank link
* | | | | Mergeunknown2005-02-111-6/+13
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged include/my_pthread.h: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/table.cc: SCCS merged
| * | | Merge commit triggerunknown2005-02-101-6/+13
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged BitKeeper/triggers/post-commit: Merge changes
| | * | Add BUG# to subject and X-Bug header for all outgoingunknown2005-01-251-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 BitKeeper/triggers/post-commit: Update URL for docs page
View Lorry Controller Status