diff options
| author | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-20 22:27:49 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg.bruehe@oracle.com> | 2012-03-20 22:27:49 +0100 |
| commit | 747fbf8f8b46e6321819dc17c806a6f577111da4 (patch) | |
| tree | 090ea3ae9b50973297879fb1882004bcd4ea5c6c /.bzr-mysql | |
| parent | 7f4d66d4cff50cb8fd89551eb58930289e6fadd4 (diff) | |
| parent | bfaebe3f5e4b917c4498e234bad7a9d45d07ca62 (diff) | |
| download | mariadb-git-747fbf8f8b46e6321819dc17c806a6f577111da4.tar.gz | |
Merge the 5.5.22 release build into main 5.5,
conflict in "sql/filesort.cc" solved manually.
Diffstat (limited to '.bzr-mysql')
| -rw-r--r-- | .bzr-mysql/default.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index 43d479a1043..cd22619d7b4 100644 --- a/.bzr-mysql/default.conf +++ b/.bzr-mysql/default.conf @@ -1,4 +1,4 @@ [MYSQL] -post_commit_to = "commits@lists.mysql.com" -post_push_to = "commits@lists.mysql.com" +post_commit_to = "MYSQL_COMMITS_WW@ORACLE.COM" +post_push_to = "MYSQL_COMMITS_WW@ORACLE.COM" tree_name = "mysql-5.5" |