diff options
| author | Georgi Kodinov <joro@sun.com> | 2010-02-03 17:25:29 +0200 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2010-02-03 17:25:29 +0200 |
| commit | d0ac5a75b31881d8b8f76e51aafcc172476f1e26 (patch) | |
| tree | 77e0b22df8b5ce49a49ef6f585772a5080506d40 | |
| parent | 0a90bfe6c019fd1dc3db3090de969077ac311fb5 (diff) | |
| parent | 2fdaf377a2ff60147c2545f7fbc3c1b43635b1f4 (diff) | |
| download | mariadb-git-d0ac5a75b31881d8b8f76e51aafcc172476f1e26.tar.gz | |
merge
| -rw-r--r-- | .bzr-mysql/default.conf | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.bzr-mysql/default.conf b/.bzr-mysql/default.conf index e613cefc614..f044f8e62da 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-5.1-bugteam" +tree_name = "mysql-5.1" diff --git a/configure.in b/configure.in index eeb1da8670a..f2e83abc60c 100644 --- a/configure.in +++ b/configure.in @@ -7,7 +7,7 @@ AC_PREREQ(2.59) # Remember to also update version.c in ndb. # When changing major version number please also check switch statement # in mysqlbinlog::check_master_version(). -AC_INIT([MySQL Server], [5.1.43], [], [mysql]) +AC_INIT([MySQL Server], [5.1.44], [], [mysql]) AC_CONFIG_SRCDIR([sql/mysqld.cc]) AC_CANONICAL_SYSTEM # USTAR format gives us the possibility to store longer path names in |