diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-05-15 18:23:36 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-05-15 18:23:36 +0200 |
| commit | 2a9c97f200252468b4cc4a9ae6ad55f98bc07a5c (patch) | |
| tree | 89f8b2c8c9eca053b447872261437f00eaff84a3 /BitKeeper | |
| parent | 5eaf5f7250b96e0aff244d57327f7b8a0d696802 (diff) | |
| parent | e9e6b9e477fbb5920ba929e0851eb0d4e50ec7aa (diff) | |
| download | mariadb-git-2a9c97f200252468b4cc4a9ae6ad55f98bc07a5c.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
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
Diffstat (limited to 'BitKeeper')
| -rwxr-xr-x | BitKeeper/triggers/pre-outgoing.crash-protect.pl | 1 | ||||
| -rwxr-xr-x | BitKeeper/triggers/pre-resolve.crash-protect.pl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/BitKeeper/triggers/pre-outgoing.crash-protect.pl b/BitKeeper/triggers/pre-outgoing.crash-protect.pl index 80567012c0f..b83e356e3f8 100755 --- a/BitKeeper/triggers/pre-outgoing.crash-protect.pl +++ b/BitKeeper/triggers/pre-outgoing.crash-protect.pl @@ -47,6 +47,7 @@ my @bad_csets= 'stewart@mysql.com|ChangeSet|20060525073521|11169', 'stewart@mysql.com|ChangeSet|20060605154220|12975', 'stewart@mysql.com|ChangeSet|20060606040001|15337', + 'hartmut@mysql.com/linux.site|ChangeSet|20070413121444|50289' ); # Read the list of changesets. diff --git a/BitKeeper/triggers/pre-resolve.crash-protect.pl b/BitKeeper/triggers/pre-resolve.crash-protect.pl index 80567012c0f..b83e356e3f8 100755 --- a/BitKeeper/triggers/pre-resolve.crash-protect.pl +++ b/BitKeeper/triggers/pre-resolve.crash-protect.pl @@ -47,6 +47,7 @@ my @bad_csets= 'stewart@mysql.com|ChangeSet|20060525073521|11169', 'stewart@mysql.com|ChangeSet|20060605154220|12975', 'stewart@mysql.com|ChangeSet|20060606040001|15337', + 'hartmut@mysql.com/linux.site|ChangeSet|20070413121444|50289' ); # Read the list of changesets. |