Skip to content

M
MariaDB
Commit 23bcd3a7 authored by unknown's avatar unknown
Browse files
Options

Merge bk-internal:/home/bk/mysql-5.1-maint 

into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-new-maint
parents dc49ca35 2a9c97f2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 0 deletions
BitKeeper/triggers/pre-outgoing.crash-protect.pl
View file @ 23bcd3a7
...@@ -47,6 +47,7 @@ my @bad_csets= ...@@ -47,6 +47,7 @@ my @bad_csets=
'stewart@mysql.com|ChangeSet|20060525073521|11169', 'stewart@mysql.com|ChangeSet|20060525073521|11169',
'stewart@mysql.com|ChangeSet|20060605154220|12975', 'stewart@mysql.com|ChangeSet|20060605154220|12975',
'stewart@mysql.com|ChangeSet|20060606040001|15337', 'stewart@mysql.com|ChangeSet|20060606040001|15337',
'hartmut@mysql.com/linux.site|ChangeSet|20070413121444|50289'
); );
# Read the list of changesets. # Read the list of changesets.
......
BitKeeper/triggers/pre-resolve.crash-protect.pl
View file @ 23bcd3a7
...@@ -47,6 +47,7 @@ my @bad_csets= ...@@ -47,6 +47,7 @@ my @bad_csets=
'stewart@mysql.com|ChangeSet|20060525073521|11169', 'stewart@mysql.com|ChangeSet|20060525073521|11169',
'stewart@mysql.com|ChangeSet|20060605154220|12975', 'stewart@mysql.com|ChangeSet|20060605154220|12975',
'stewart@mysql.com|ChangeSet|20060606040001|15337', 'stewart@mysql.com|ChangeSet|20060606040001|15337',
'hartmut@mysql.com/linux.site|ChangeSet|20070413121444|50289'
); );
# Read the list of changesets. # Read the list of changesets.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7