diff options
author | unknown <jimw@mysql.com> | 2005-02-17 16:16:58 -0800 |
---|---|---|
committer | unknown <jimw@mysql.com> | 2005-02-17 16:16:58 -0800 |
commit | 90cc9c6bb60c60dbf6e603a0cb5d9ae736a9a906 (patch) | |
tree | 76f459723b9f122eb50373fe7c42ffc72f277131 /BitKeeper/triggers | |
parent | 4c5a3914b8924ebc72c6c4233c18d2e3f1ad118b (diff) | |
parent | 2b69b4ae4f0b29a0eceb72a404b7f52a67748875 (diff) | |
download | mariadb-git-90cc9c6bb60c60dbf6e603a0cb5d9ae736a9a906.tar.gz |
Merge
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.
Diffstat (limited to 'BitKeeper/triggers')
-rwxr-xr-x | BitKeeper/triggers/post-commit | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/BitKeeper/triggers/post-commit b/BitKeeper/triggers/post-commit index 4e0135fa822..d19c724268c 100755 --- a/BitKeeper/triggers/post-commit +++ b/BitKeeper/triggers/post-commit @@ -19,6 +19,13 @@ BK_STATUS=$BK_STATUS$BK_COMMIT if [ "$BK_STATUS" = OK ] then +HAS_ACTUAL_CHANGES=`bk cset -r+ -d | grep -v "^#"` +if [ "$HAS_ACTUAL_CHANGES" = "" ] +then + echo ChangeSet had no real changes, not sending emails + exit +fi + CHANGESET=`bk -R prs -r+ -h -d':P:::I:' ChangeSet` BUG=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Bb][Uu][Gg] *# *\([0-9][0-9]*\).*$/\1/p'` WL=`bk -R prs -r+ -h -d':C:' ChangeSet | sed -ne 's/^.*[Ww][Ll] *# *\([0-9][0-9]*\).*$/ WL#\1/p'` |