summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2009-10-23 00:14:05 +0400
committerAlexander Nozdrin <alik@sun.com>2009-10-23 00:14:05 +0400
commit2f5413ebc5a47ed45abe0d3c660cfbf673c666e2 (patch)
tree4b21a7cc355f231716f2a2641df3913541fb0c83
parent2f0c4678e5e24b48f459efe433aad8364fa88de2 (diff)
parent4b8eb9891ce0219d53169b5efeed3e4e9b7afdf7 (diff)
downloadmariadb-git-2f5413ebc5a47ed45abe0d3c660cfbf673c666e2.tar.gz
Merge from mysql-trunk.
-rw-r--r--.bzr-mysql/default.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf
index 92fe811808b..e6ad6e85da4 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"
-tree_name = "mysql-next-mr-mtr"
+tree_name = "mysql-5.5.0-next-mr"