From 318257b0114da7d375178b79a1faa8f2ccf8b095 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Tue, 14 Jul 2015 06:07:36 +0200 Subject: [PATCH] - Fix for CONC-136: mysql_select_db_start/cont aren't declared in mysql.h - ma_dyncol.h no longer requires longlong declaration from my_global.h --- include/ma_dyncol.h | 12 ++++++++++++ include/mysql.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/include/ma_dyncol.h b/include/ma_dyncol.h index c1eb71c6..3b5c8ae3 100644 --- a/include/ma_dyncol.h +++ b/include/ma_dyncol.h @@ -39,6 +39,18 @@ extern "C" { #endif #include +#ifndef longlong_defined +#if defined(HAVE_LONG_LONG) && SIZEOF_LONG != 8 +typedef unsigned long long int ulonglong; /* ulong or unsigned long long */ +typedef long long int longlong; +#else +typedef unsigned long ulonglong; /* ulong or unsigned long long */ +typedef long longlong; +#endif +#define longlong_defined +#endif + + #ifndef _my_sys_h typedef struct st_dynamic_string { diff --git a/include/mysql.h b/include/mysql.h index 4b10453a..19856282 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -506,6 +506,8 @@ int STDCALL mysql_autocommit_start(my_bool *ret, MYSQL * mysql, int STDCALL mysql_autocommit_cont(my_bool *ret, MYSQL * mysql, int status); int STDCALL mysql_next_result_start(int *ret, MYSQL *mysql); int STDCALL mysql_next_result_cont(int *ret, MYSQL *mysql, int status); +int STDCALL mysql_select_db_start(int *ret, MYSQL *mysql, const char *db); +int STDCALL mysql_select_db_cont(int *ret, MYSQL *mysql, int ready_status); int STDCALL mysql_stmt_next_result_start(int *ret, MYSQL_STMT *stmt); int STDCALL mysql_stmt_next_result_cont(int *ret, MYSQL_STMT *stmt, int status);