diff options
| author | unknown <tulin@build.mysql.com> | 2005-01-05 15:55:26 +0100 |
|---|---|---|
| committer | unknown <tulin@build.mysql.com> | 2005-01-05 15:55:26 +0100 |
| commit | 1aa55857f045409524190067c17a56fa98807994 (patch) | |
| tree | 1a44dde4c5e228a4c8fcd76553ce019ef9166df6 /BitKeeper | |
| parent | 7f7cdd0b7e9d9efb3039eb5aeb20cac4973ecb35 (diff) | |
| parent | c99b4964ca7da035bf2895812ef02bcfbdefa67a (diff) | |
| download | mariadb-git-1aa55857f045409524190067c17a56fa98807994.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1
into build.mysql.com:/users/tulin/mysql-4.1-cluster-extra
BitKeeper/etc/logging_ok:
auto-union
sql/ha_innodb.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 2 | ||||
| -rwxr-xr-x | BitKeeper/triggers/pre-delta | 11 |
2 files changed, 13 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 65255fa6bd3..9e25aca5fa2 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -103,6 +103,7 @@ lenz@mysql.com magnus@neptunus.(none) magnus@shellback.(none) marko@hundin.mysql.fi +marty@linux.site mats@mysql.com matt@booty.(none) matt@mysql.com @@ -164,6 +165,7 @@ paul@frost.snake.net paul@ice.local paul@ice.snake.net paul@kite-hub.kitebird.com +paul@snake-hub.snake.net paul@teton.kitebird.com pekka@mysql.com pem@mysql.com diff --git a/BitKeeper/triggers/pre-delta b/BitKeeper/triggers/pre-delta index e22ae9ce940..cd861703bb5 100755 --- a/BitKeeper/triggers/pre-delta +++ b/BitKeeper/triggers/pre-delta @@ -1,5 +1,16 @@ #!/bin/sh +if [ "$BK_USER" = "Administrator" -o "$BK_USER" = "mysqldev" ] +then + echo "Error: you cannot checkin as 'Administrator' or 'mysqldev' user." + echo "as a workaround set BK_USER to your nickname" + echo "e.g.: export BK_USER='bar'" + echo "" + echo "Checkin FAILED!" + echo "Set BK_USER and retry." + exit 1 +fi + if [ `tail -c1 $BK_FILE` ] then echo "File $BK_FILE does not end with a new-line character!" |