- b2 (will post it to internals@)

diff --git a/NEWS b/NEWS
index 4041fc8cc4db9124aca1f16695638588e0cc913c..245032b43c4c99183a9919344f4954a5be5a1dd3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+11 Jun 2005, PHP 5.1 Beta 2
+- Fixed PDO shutdown problem (possible inifite loop running rollback on
+  shutdown). (Wez)
+- Fixed PECL bug #3714 (beginTransaction doesn't work if you're in
+  auto-commit mode). (Wez)
+
 10 Jun 2005, PHP 5.1 Beta 1
 - Added user opcode API that allow overloading of opcode handlers. (Dmitry)
 - Opcodes ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR are mefget into one

diff --git a/Zend/zend.h b/Zend/zend.h
index 248e7d02330e42e29156d03e8d74ffc3debc1046..68efea29130267a50ee15feadda6bd01e5a2e964 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -22,7 +22,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "2.1.0-dev"
+#define ZEND_VERSION "2.1.0b2"
 
 #define ZEND_ENGINE_2
 

diff --git a/configure.in b/configure.in
index 1db39657d8691a1e7b564260115bf9696a846dc8..093ee32d95a51ac8d6d6c3990d09ca44cfe1ac27 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_CONFIG_HEADER(main/php_config.h)
 MAJOR_VERSION=5
 MINOR_VERSION=1
 RELEASE_VERSION=0
-EXTRA_VERSION="-dev"
+EXTRA_VERSION="b2"
 VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION"
 
 dnl Define where extension directories are located in the configure context

diff --git a/main/php_version.h b/main/php_version.h
index eefa06de776db7c4389d5dcfda0c97181c152db5..423e53eb9c7edb6d4fbde130c8f632b29a8394e5 100644 (file)
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,5 +3,5 @@
 #define PHP_MAJOR_VERSION 5
 #define PHP_MINOR_VERSION 1
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "5.1.0-dev"
+#define PHP_EXTRA_VERSION "b2"
+#define PHP_VERSION "5.1.0b2"