database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

- Unittests: link static library instead of dynamic

Browse Source 
- TLS/SSL: renamed HAVE_SSL to HAVE_TLS to avoid trouble in
  10.2-integration
- Fixed wrong timeout in non-blocking mode
- Fixed valgrind error in prepared statement
This commit is contained in:
Georg Richter
2016-03-28 10:29:55 +02:00
parent 2004962331
commit bea035a72b
18 changed files with 89 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libmariadb/mariadb_stmt.c
View File

@@ -444,6 +444,8 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p)
char t_buffer[MAX_TIME_STR_LEN];
uint len= 0;
memset(t_buffer, 0, MAX_TIME_STR_LEN);
t_buffer[1]= t->neg ? 1 : 0;
int4store(t_buffer + 2, t->day);
t_buffer[6]= (uchar) t->hour;
@@ -480,6 +482,7 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p)
char t_buffer[MAX_DATETIME_STR_LEN];
uint len;
memset(t_buffer, 0, MAX_DATETIME_STR_LEN);
int2store(t_buffer + 1, t->year);
t_buffer[3]= (char) t->month;
t_buffer[4]= (char) t->day;
@@ -489,7 +492,7 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p)
if (t->second_part)
{
int4store(t_buffer + 8, t->second_part);
len= 12;
len= 11;
}
else if (t->hour || t->minute || t->second)
len= 7;
@@ -511,6 +514,7 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p)
case MYSQL_TYPE_STRING:
case MYSQL_TYPE_DECIMAL:
case MYSQL_TYPE_NEWDECIMAL:
case MYSQL_TYPE_GEOMETRY:
{
ulong len= (ulong)*stmt->params[column].length;
/* to is after p. The latter hasn't been moved */
@@ -567,7 +571,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req
int1store(p, (unsigned char) stmt->flags);
p++;
int1store(p, 1); /* and send 1 for iteration count */
int4store(p, 1); /* and send 1 for iteration count */
p+= 4;
if (stmt->param_count)
@@ -580,7 +584,7 @@ unsigned char* mysql_stmt_execute_generate_request(MYSQL_STMT *stmt, size_t *req
{
size_t offset= p - start;
length+= offset + null_count + 20;
if (!(start= (uchar *)realloc((gptr)start, length)))
if (!(start= (uchar *)realloc(start, length)))
goto mem_error;
p= start + offset;
}