diff options
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | libmysql/client_settings.h | 4 | ||||
| -rw-r--r-- | libmysql/errmsg.c | 2 | ||||
| -rw-r--r-- | libmysql/libmysql.c | 18 |
4 files changed, 24 insertions, 15 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index e2888ba25f9..43b0c6187b9 100644 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -224,15 +224,16 @@ dynamic_column_exists dynamic_column_list dynamic_column_get dynamic_column_prepare_decimal -mariadb_dyncol_create_many +mariadb_dyncol_create_many_num mariadb_dyncol_create_many_named -mariadb_dyncol_update_many +mariadb_dyncol_update_many_num mariadb_dyncol_update_many_named -mariadb_dyncol_exists +mariadb_dyncol_exists_num mariadb_dyncol_exists_named -mariadb_dyncol_list +mariadb_dyncol_free +mariadb_dyncol_list_num mariadb_dyncol_list_named -mariadb_dyncol_get +mariadb_dyncol_get_num mariadb_dyncol_get_named mariadb_dyncol_has_names mariadb_dyncol_check @@ -335,7 +336,7 @@ SET(CLIENT_SOURCES ../sql-common/client.c ../sql-common/mysql_async.c ../sql-common/my_time.c - ../sql-common/client_plugin.c + ../sql-common/client_plugin.c ../sql/net_serv.cc ../sql-common/pack.c ../sql/password.c @@ -345,7 +346,7 @@ ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES}) DTRACE_INSTRUMENT(clientlib) ADD_DEPENDENCIES(clientlib GenError) -SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) +SET(LIBS clientlib dbug strings vio mysys mysys_ssl ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL}) # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. diff --git a/libmysql/client_settings.h b/libmysql/client_settings.h index ecc9a7773ca..b233614fa1e 100644 --- a/libmysql/client_settings.h +++ b/libmysql/client_settings.h @@ -34,7 +34,9 @@ extern char * mysql_unix_port; CLIENT_SECURE_CONNECTION | \ CLIENT_MULTI_RESULTS | \ CLIENT_PS_MULTI_RESULTS | \ - CLIENT_PLUGIN_AUTH) + CLIENT_PLUGIN_AUTH | \ + CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ + CLIENT_CONNECT_ATTRS) sig_handler my_pipe_sig_handler(int sig); void read_user_name(char *name); diff --git a/libmysql/errmsg.c b/libmysql/errmsg.c index 4c4485f7ec4..9985fa2233c 100644 --- a/libmysql/errmsg.c +++ b/libmysql/errmsg.c @@ -85,6 +85,8 @@ const char *client_errors[]= "The number of columns in the result set differs from the number of bound buffers. You must reset the statement, rebind the result set columns, and execute the statement again", "This handle is already connected. Use a separate handle for each connection.", "Authentication plugin '%s' cannot be loaded: %s", + "There is an attribute with the same name already", + "Authentication plugin '%s' reported error: %s", "" }; diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c index 6cc44c26aa3..78de4b8867f 100644 --- a/libmysql/libmysql.c +++ b/libmysql/libmysql.c @@ -1139,7 +1139,7 @@ void my_net_local_init(NET *net) my_net_set_read_timeout(net, CLIENT_NET_READ_TIMEOUT); my_net_set_write_timeout(net, CLIENT_NET_WRITE_TIMEOUT); net->retry_count= 1; - net->max_packet_size= max(net_buffer_length, max_allowed_packet); + net->max_packet_size= MY_MAX(net_buffer_length, max_allowed_packet); } /* @@ -3201,7 +3201,9 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, case MYSQL_TYPE_TIME: { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; - str_to_time(value, length, tm, 0, &err); + MYSQL_TIME_STATUS status; + str_to_time(value, length, tm, 0, &status); + err= status.warnings; *param->error= test(err); break; } @@ -3210,7 +3212,9 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, case MYSQL_TYPE_TIMESTAMP: { MYSQL_TIME *tm= (MYSQL_TIME *)buffer; - (void) str_to_datetime(value, length, tm, 0, &err); + MYSQL_TIME_STATUS status; + (void) str_to_datetime(value, length, tm, 0, &status); + err= status.warnings; *param->error= test(err) && (param->buffer_type == MYSQL_TYPE_DATE && tm->time_type != MYSQL_TIMESTAMP_DATE); break; @@ -3235,7 +3239,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value, copy_length= end - start; /* We've got some data beyond offset: copy up to buffer_length bytes */ if (param->buffer_length) - memcpy(buffer, start, min(copy_length, param->buffer_length)); + memcpy(buffer, start, MY_MIN(copy_length, param->buffer_length)); } else copy_length= 0; @@ -3460,7 +3464,7 @@ static void fetch_float_with_conversion(MYSQL_BIND *param, MYSQL_FIELD *field, size_t len; if (field->decimals >= NOT_FIXED_DEC) len= my_gcvt(value, type, - (int) min(sizeof(buff)-1, param->buffer_length), + (int) MY_MIN(sizeof(buff)-1, param->buffer_length), buff, NULL); else len= my_fcvt(value, (int) field->decimals, buff, NULL); @@ -3770,7 +3774,7 @@ static void fetch_result_bin(MYSQL_BIND *param, uchar **row) { ulong length= net_field_length(row); - ulong copy_length= min(length, param->buffer_length); + ulong copy_length= MY_MIN(length, param->buffer_length); memcpy(param->buffer, (char *)*row, copy_length); *param->length= length; *param->error= copy_length < length; @@ -3782,7 +3786,7 @@ static void fetch_result_str(MYSQL_BIND *param, uchar **row) { ulong length= net_field_length(row); - ulong copy_length= min(length, param->buffer_length); + ulong copy_length= MY_MIN(length, param->buffer_length); memcpy(param->buffer, (char *)*row, copy_length); /* Add an end null if there is room in the buffer */ if (copy_length != param->buffer_length) |