patches/mysql-no-ulong.patch

   1 commit a32c5ff75254ded2b3148eefa315b7bbfb74443d
   2 Author: Fred Emmott <fred@fredemmott.co.uk>
   3 Date:   Tue Mar 27 08:23:26 2018 -0700
   4
   5     Portability: `unsigned long` instead of `ulong`
   6
   7     `ulong` is undefiend on macos, and otherwise unused. Blocks merging updates into HHVM.
   8
   9 diff --git a/third-party/webscalesqlclient/mysql-5.6/include/mysql.h b/third-party/webscalesqlclient/mysql-5.6/include/mysql.h
  10 index 5aa89f4d58..41b1a792c3 100644
  11 --- a/third-party/webscalesqlclient/mysql-5.6/include/mysql.h
  12 +++ b/third-party/webscalesqlclient/mysql-5.6/include/mysql.h
  13 @@ -670,8 +670,8 @@ unsigned int        STDCALL mysql_thread_safe(void);
  14  my_bool                STDCALL mysql_embedded(void);
  15  my_bool         STDCALL mysql_read_query_result(MYSQL *mysql);
  16  int             STDCALL mysql_reset_connection(MYSQL *mysql);
  17 -ulong STDCALL cli_safe_read(MYSQL *mysql, my_bool *is_data_packet);
  18 -net_async_status STDCALL cli_safe_read_nonblocking(MYSQL *mysql, ulong* res,
  19 +unsigned long   STDCALL cli_safe_read(MYSQL *mysql, my_bool *is_data_packet);
  20 +net_async_status STDCALL cli_safe_read_nonblocking(MYSQL *mysql, unsigned long *res,
  21                                                     my_bool *is_data_packet);
  22
  23