bzr push into mysql-5.1-bugteam branch (Georgi.Kodinov:3455 to 3457)

[Georgi Kodinov]

 3457 Georgi Kodinov	2010-07-02 [merge]
      merge

 3456 Georgi Kodinov	2010-07-02 [merge]
      merge

    modified:
      configure.in
 3455 Alexey Kopytov	2010-07-01 [merge]
      Automerge.

    modified:
      include/my_alarm.h
      include/my_global.h
      libmysql/libmysql.c
      mysys/thr_alarm.c
      sql/mysqld.cc
=== modified file 'configure.in'
--- a/configure.in	2010-06-02 09:54:40 +0000
+++ b/configure.in	2010-07-02 11:23:07 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.48], [], [mysql])
+AC_INIT([MySQL Server], [5.1.49], [], [mysql])
 
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM


Attachment: [text/bzr-bundle] bzr/[e-mail]