Part for fix of CONC-200:

declare type of my_ulonglong
mariadb-corporation · Sep 8, 2016 · c68c5dc · c68c5dc
1 parent b0506f6
commit c68c5dc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 192 deletions.
diff --git a/include/ma_global.h b/include/ma_global.h
@@ -709,6 +709,7 @@ typedef char		*my_string; /* String of characters */
 typedef unsigned long	size_s; /* Size of strings (In string-funcs) */
 typedef int		myf;	/* Type of MyFlags in my_funcs */
 typedef char		my_bool; /* Small bool */
+typedef unsigned long long my_ulonglong;
 #if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
 typedef char		bool;	/* Ordinary boolean values 0 1 */
 #endif

diff --git a/include/mysql.h b/include/mysql.h
@@ -37,6 +37,7 @@ extern "C" {
 #if !defined (_global_h) && !defined (MY_GLOBAL_INCLUDED) /* If not standard header */
 #include <sys/types.h>
 typedef char my_bool;
+typedef unsigned long long my_ulonglong;
 
 #if !defined(_WIN32)
 #define STDCALL
@@ -467,7 +468,7 @@ void my_set_error(MYSQL *mysql, unsigned int error_nr,
 /* Functions to get information from the MYSQL and MYSQL_RES structures */
 /* Should definitely be used if one uses shared libraries */
 
-unsigned long long STDCALL mysql_num_rows(MYSQL_RES *res);
+my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res);
 unsigned int STDCALL mysql_num_fields(MYSQL_RES *res);
 my_bool STDCALL mysql_eof(MYSQL_RES *res);
 MYSQL_FIELD *STDCALL mysql_fetch_field_direct(MYSQL_RES *res,
@@ -479,11 +480,11 @@ unsigned int STDCALL mysql_field_tell(MYSQL_RES *res);
 unsigned int STDCALL mysql_field_count(MYSQL *mysql);
 my_bool STDCALL mysql_more_results(MYSQL *mysql);
 int STDCALL mysql_next_result(MYSQL *mysql);
-unsigned long long STDCALL mysql_affected_rows(MYSQL *mysql);
+my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql);
 my_bool STDCALL mysql_autocommit(MYSQL *mysql, my_bool mode);
 my_bool STDCALL mysql_commit(MYSQL *mysql);
 my_bool STDCALL mysql_rollback(MYSQL *mysql);
-unsigned long long STDCALL mysql_insert_id(MYSQL *mysql);
+my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql);
 unsigned int STDCALL mysql_errno(MYSQL *mysql);
 char * STDCALL mysql_error(MYSQL *mysql);
 char * STDCALL mysql_info(MYSQL *mysql);

diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c
@@ -3213,7 +3213,7 @@ mysql_options4(MYSQL *mysql,enum mysql_option option, const void *arg1, const vo
 ****************************************************************************/
 
 /* MYSQL_RES */
-unsigned long long STDCALL mysql_num_rows(MYSQL_RES *res)
+my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res)
 {
   return res->row_count;
 }
@@ -3256,7 +3256,7 @@ unsigned int STDCALL mysql_field_count(MYSQL *mysql)
   return mysql->field_count;
 }
 
-unsigned long long STDCALL mysql_affected_rows(MYSQL *mysql)
+my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql)
 {
   return (mysql)->affected_rows;
 }
@@ -3277,7 +3277,7 @@ my_bool STDCALL mysql_rollback(MYSQL *mysql)
   return((my_bool)mysql_real_query(mysql, "ROLLBACK", sizeof("ROLLBACK")));
 }
 
-unsigned long long STDCALL mysql_insert_id(MYSQL *mysql)
+my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql)
 {
   return (mysql)->insert_id;
 }

diff --git a/libmariadb/secure/ma_cipher.h b/libmariadb/secure/ma_cipher.h