diff --git a/CMakeLists.txt b/CMakeLists.txt index ca25fc6f..7c0e79ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,6 @@ IF(WITH_SIGNCODE) MARK_AS_ADVANCED(SIGN_OPTIONS) ENDIF() - IF(WITH_RTC) SET(RTC_OPTIONS "/RTC1 /RTCc") ENDIF() diff --git a/include/mysql.h b/include/mysql.h index a90bbd54..851e2069 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -134,7 +134,7 @@ extern unsigned int mariadb_deinitialize_ssl; } /* For mysql_async.c */ -#define set_mysql_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0) +#define set_mariadb_error(A,B,C) SET_CLIENT_ERROR((A),(B),(C),0) #define unknown_sqlstate SQLSTATE_UNKNOWN #define CLEAR_CLIENT_ERROR(a) \ @@ -337,7 +337,7 @@ struct st_mysql_options { my_bool unused_2; void *unused_3, *unused_4, *unused_5, *unused_6; LIST *stmts; - const struct st_mysql_methods *methods; + const struct st_mariadb_methods *methods; void *thd; my_bool *unbuffered_fetch_owner; char *info_buffer; @@ -762,7 +762,7 @@ struct st_mariadb_api { }; /* these methods can be overwritten by db plugins */ -struct st_mysql_methods { +struct st_mariadb_methods { MYSQL *(*db_connect)(MYSQL *mysql, const char *host, const char *user, const char *passwd, const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag); void (*db_close)(MYSQL *mysql); diff --git a/include/mysql_com.h b/include/mysql_com.h index 0cbc7817..704c19fc 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -345,7 +345,7 @@ int my_net_init(NET *net, MARIADB_PVIO *pvio); void net_end(NET *net); void net_clear(NET *net); int net_flush(NET *net); -int my_net_write(NET *net,const char *packet, size_t len); +int my_net_write(NET *net,const unsigned char *packet, size_t len); int net_write_command(NET *net,unsigned char command,const char *packet, size_t len); int net_real_write(NET *net,const char *packet, size_t len); diff --git a/libmariadb/libmariadb.c b/libmariadb/libmariadb.c index 0cc65506..f44cd4a7 100644 --- a/libmariadb/libmariadb.c +++ b/libmariadb/libmariadb.c @@ -119,7 +119,7 @@ my_string mysql_unix_port=0; #define CONNECT_TIMEOUT 0 #endif -struct st_mysql_methods MARIADB_DEFAULT_METHODS; +struct st_mariadb_methods MARIADB_DEFAULT_METHODS; #if defined(MSDOS) || defined(_WIN32) // socket_errno is defined in my_global.h for all platforms @@ -3994,7 +3994,7 @@ struct st_mariadb_api MARIADB_API= * stored in mysql->methods and can be overwritten by * a plugin, e.g. for using another database */ -struct st_mysql_methods MARIADB_DEFAULT_METHODS = { +struct st_mariadb_methods MARIADB_DEFAULT_METHODS = { /* open a connection */ mthd_my_real_connect, /* close connection */ diff --git a/libmariadb/mysql_async.c b/libmariadb/mysql_async.c index f7dfc998..3729e79c 100644 --- a/libmariadb/mysql_async.c +++ b/libmariadb/mysql_async.c @@ -250,7 +250,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql) } \ if (res < 0) \ { \ - set_mysql_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + set_mariadb_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ *ret= err_val; \ } \ else \ @@ -263,7 +263,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql) (mysql_val)->options.extension->async_context; \ if (!b->suspended) \ { \ - set_mysql_error((mysql_val), CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); \ + set_mariadb_error((mysql_val), CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); \ *ret= err_val; \ return 0; \ } \ @@ -277,7 +277,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql) b->suspended= 0; \ if (res < 0) \ { \ - set_mysql_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + set_mariadb_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ *ret= err_val; \ } \ else \ @@ -311,7 +311,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql) return b->events_to_wait_for; \ } \ if (res < 0) \ - set_mysql_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + set_mariadb_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ return 0; #define MK_ASYNC_CONT_BODY_VOID_RETURN(mysql_val) \ @@ -320,7 +320,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql) (mysql_val)->options.extension->async_context; \ if (!b->suspended) \ { \ - set_mysql_error((mysql_val), CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); \ + set_mariadb_error((mysql_val), CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate); \ return 0; \ } \ \ @@ -332,7 +332,7 @@ mysql_get_timeout_value_ms(const MYSQL *mysql) return b->events_to_wait_for; /* (Still) suspended */ \ b->suspended= 0; \ if (res < 0) \ - set_mysql_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ + set_mariadb_error((mysql_val), CR_OUT_OF_MEMORY, unknown_sqlstate); \ return 0; @@ -432,7 +432,7 @@ mysql_real_query_start(int *ret, MYSQL *mysql, const char *stmt_str, size_t leng } if (res < 0) { - set_mysql_error((mysql), CR_OUT_OF_MEMORY, unknown_sqlstate); + set_mariadb_error((mysql), CR_OUT_OF_MEMORY, unknown_sqlstate); *ret= 1; } else diff --git a/libmariadb/net.c b/libmariadb/net.c index 7e0161d4..4511f9ec 100644 --- a/libmariadb/net.c +++ b/libmariadb/net.c @@ -235,7 +235,7 @@ int net_flush(NET *net) */ int -my_net_write(NET *net, const char *packet, size_t len) +my_net_write(NET *net, const uchar *packet, size_t len) { uchar buff[NET_HEADER_SIZE]; while (len >= MAX_PACKET_LENGTH)