database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bb-10.2-ext into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2017-10-04 08:24:06 +03:00
parent 2cf3e2ea2f 61b2618d3a
commit 2c1067166d
334 changed files with 5235 additions and 3076 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libmysqld/libmysql.c
View File

@@ -2053,9 +2053,9 @@ static my_bool store_param(MYSQL_STMT *stmt, MYSQL_BIND *param)
{
NET *net= &stmt->mysql->net;
DBUG_ENTER("store_param");
DBUG_PRINT("enter",("type: %d buffer: 0x%lx length: %lu is_null: %d",
DBUG_PRINT("enter",("type: %d buffer:%p length: %lu is_null: %d",
param->buffer_type,
(long) (param->buffer ? param->buffer : NullS),
param->buffer,
*param->length, *param->is_null));
if (*param->is_null)
@@ -2979,8 +2979,8 @@ mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number,
MYSQL_BIND *param;
DBUG_ENTER("mysql_stmt_send_long_data");
DBUG_ASSERT(stmt != 0);
DBUG_PRINT("enter",("param no: %d data: 0x%lx, length : %ld",
param_number, (long) data, length));
DBUG_PRINT("enter",("param no: %d data: %p, length : %ld",
param_number, data, length));
/*
We only need to check for stmt->param_count, if it's not null
@@ -3249,7 +3249,7 @@ static void fetch_string_with_conversion(MYSQL_BIND *param, char *value,
ulong copy_length;
if (start < end)
{
copy_length= end - start;
copy_length= (ulong)(end - start);
/* We've got some data beyond offset: copy up to buffer_length bytes */
if (param->buffer_length)
memcpy(buffer, start, MY_MIN(copy_length, param->buffer_length));