Require libcouchbase 2.9.5

Change-Id: I0bb2323edea3a1528038fe613a9c7385d865a41e
Reviewed-on: http://review.couchbase.org/99890
Tested-by: Build Bot <[email protected]>
Reviewed-by: Sergey Avseyev <[email protected]>

Author: avsej

config.m4

@@ -24,14 +24,14 @@ if test "$PHP_COUCHBASE" != "no"; then
                  libcouchbase.a should be in <libcouchbase-dir>/lib)
   fi
 
-  AC_MSG_CHECKING([for libcouchbase version >= 2.9.2])
+  AC_MSG_CHECKING([for libcouchbase version >= 2.9.5])
   LCB_VERSION=$($EGREP "define LCB_VERSION " $LIBCOUCHBASE_DIR/include/libcouchbase/configuration.h | $SED -e 's/[[^0-9x]]//g')
   AC_MSG_RESULT([$LCB_VERSION])
   if test "x$LCB_VERSION" = "x0x000000"; then
     AC_MSG_ERROR([seems like libcouchbase is not installed from official tarball or git clone. Do not use github tags to download releases.])
   fi
-  if test $(printf %d $LCB_VERSION) -lt $(printf %d 0x020902); then
-    AC_MSG_ERROR([libcouchbase greater or equal to 2.9.2 required])
+  if test $(printf %d $LCB_VERSION) -lt $(printf %d 0x020905); then
+    AC_MSG_ERROR([libcouchbase greater or equal to 2.9.5 required])
   fi
 
   PHP_ADD_INCLUDE($LIBCOUCHBASE_DIR/include)

src/couchbase/bucket.c

@@ -357,7 +357,7 @@ PHP_METHOD(Bucket, query)
             RETURN_NULL();
         }
         smart_str_0(&buf);
-        cmd.cmdflags |= LCB_CMDN1QL_F_CBASQUERY;
+        cmd.cmdflags |= LCB_CMDN1QL_F_ANALYTICSQUERY;
         PCBC_SMARTSTR_SET(buf, cmd.query, cmd.nquery);
         pcbc_log(LOGARGS(obj, TRACE), "ANALYTICS: " LCB_LOG_SPEC("%.*s"),
                  lcb_is_redacting_logs(obj->conn->lcb) ? LCB_LOG_UD_OTAG : "", PCBC_SMARTSTR_TRACE(buf),