Stop mysql syntax error exceptions

hphp/runtime/ext/pdo_mysql.cpp

@@ -19,6 +19,7 @@
 #include "hphp/runtime/ext/stream/ext_stream.h"
 #include "hphp/runtime/vm/jit/translator-inline.h"
 #include "hphp/util/network.h"
+#include "hphp/util/logger.h"
 #include "mysql.h"
 
 #ifdef PHP_MYSQL_UNIX_SOCK_ADDR
@@ -484,9 +485,15 @@ int PDOMySqlConnection::handleError(const char *file, int line,
     if (stmt) {
       stmt->dbh->fetchErr(stmt, info);
     }
-    throw_pdo_exception(String(*pdo_err, CopyString), info,
+    constexpr int kSQLSyntaxErrorCode = 1064;
+    if(einfo->errcode != kSQLSyntaxErrorCode) {
+      throw_pdo_exception(String(*pdo_err, CopyString), info,
                         "SQLSTATE[%s] [%d] %s",
                         pdo_err[0], einfo->errcode, einfo->errmsg);
+    }
+    else {
+      Logger::Error("%s in %s:%d", einfo->errmsg, file, line);
+    }
   }
   return einfo->errcode;
 }

hphp/test/slow/ext_pdo/pdo_mysql_syntax_error.php

@@ -0,0 +1,15 @@
+<?php
+$host   = getenv("MYSQL_TEST_HOST")   ? getenv("MYSQL_TEST_HOST") : "localhost";
+$port   = getenv("MYSQL_TEST_PORT")   ? getenv("MYSQL_TEST_PORT") : 3306;
+$user   = getenv("MYSQL_TEST_USER")   ? getenv("MYSQL_TEST_USER") : "root";
+$passwd = getenv("MYSQL_TEST_PASSWD") ? getenv("MYSQL_TEST_PASSWD") : "";
+$db     = getenv("MYSQL_TEST_DB")     ? getenv("MYSQL_TEST_DB") : "test";
+
+$pdo = new PDO("mysql:dbname=$db;host=$host", $user, $passwd);
+
+try {
+  $pdo->exec('se t @@time_zone="+3:00";');
+  var_dump(true);
+} catch (PDOException $e) {
+  var_dump($e);
+}

hphp/test/slow/ext_pdo/pdo_mysql_syntax_error.php.expect

@@ -0,0 +1 @@
+bool(true)

hphp/test/slow/ext_pdo/pdo_mysql_syntax_error.php.opts

@@ -0,0 +1 @@
+-vLog.Level=None