nightly update

ChangeLog

@@ -1,3 +1,20 @@
+ 2015-03-06 20:43  dimitr 
+   M src/jrd/jrd.cpp
+Fixed a possible reason for CORE-4705. Alex, please review.
+
+ 2015-03-06 14:04  dimitr 
+   M src/jrd/Optimizer.cpp
+Fixed inconsistency between unique vs non-unique retrievals (see CORE-4702).
+
+ 2015-03-06 10:24  dimitr 
+   M src/jrd/Optimizer.cpp
+Minor adjustments to the join order selection.
+
+ 2015-03-06 09:02  paulbeach 
+   M builds/install/arch-specific/darwin/install-script
+   A builds/install/arch-specific/darwin/launchdss.org.firebird.gds.plist
+StartupItems is now deprecated on Yosemite (10.10), use launchctl for SuperServer as well as Classic
+
  2015-03-05 16:18  alexpeshkoff 
    M src/jrd/DataTypeUtil.cpp
    M src/jrd/Database.cpp

src/jrd/build_no.h

@@ -3,16 +3,16 @@
                *** DO NOT EDIT ***
   TO CHANGE ANY INFORMATION IN HERE PLEASE
   EDIT src/misc/writeBuildNum.sh
-  FORMAL BUILD NUMBER:31698
+  FORMAL BUILD NUMBER:31702
 */
 
-#define PRODUCT_VER_STRING "3.0.0.31698"
-#define FILE_VER_STRING "WI-T3.0.0.31698"
-#define LICENSE_VER_STRING "WI-T3.0.0.31698"
-#define FILE_VER_NUMBER 3, 0, 0, 31698
+#define PRODUCT_VER_STRING "3.0.0.31702"
+#define FILE_VER_STRING "WI-T3.0.0.31702"
+#define LICENSE_VER_STRING "WI-T3.0.0.31702"
+#define FILE_VER_NUMBER 3, 0, 0, 31702
 #define FB_MAJOR_VER "3"
 #define FB_MINOR_VER "0"
 #define FB_REV_NO "0"
-#define FB_BUILD_NO "31698"
+#define FB_BUILD_NO "31702"
 #define FB_BUILD_TYPE "T"
 #define FB_BUILD_SUFFIX "Firebird 3.0 Beta 2"

src/misc/writeBuildNum.sh

@@ -9,7 +9,7 @@ BuildType=T
 MajorVer=3
 MinorVer=0
 RevNo=0
-BuildNum=31698
+BuildNum=31702
 
 NowAt=`pwd`
 cd `dirname $0`