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

removed ma_errmsg from mysql.h

Browse Source
This commit is contained in:
Georg Richter
2016-11-16 17:27:59 +01:00
parent 3378c0d8b7
commit a499722377
4 changed files with 94 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/mysql.h
View File

@@ -60,7 +60,6 @@ typedef int my_socket;
#include "mariadb_version.h"
#include "ma_list.h"
#include "mariadb_ctype.h"
#include "ma_errmsg.h"
#ifndef ST_MA_USED_MEM_DEFINED
#define ST_MA_USED_MEM_DEFINED

17
libmariadb/ma_net.c
View File

@@ -186,8 +186,7 @@ int ma_net_flush(NET *net)
** NOTE: If compression is used the original package is destroyed!
*/
int
ma_net_write(NET *net, const uchar *packet, size_t len)
int ma_net_write(NET *net, const uchar *packet, size_t len)
{
uchar buff[NET_HEADER_SIZE];
while (len >= MAX_PACKET_LENGTH)
@@ -210,8 +209,7 @@ ma_net_write(NET *net, const uchar *packet, size_t len)
return 0;
}
int
ma_net_write_command(NET *net, uchar command,
int ma_net_write_command(NET *net, uchar command,
const char *packet, size_t len,
my_bool disable_flush)
{
@@ -251,8 +249,7 @@ ma_net_write_command(NET *net, uchar command,
}
static int
ma_net_write_buff(NET *net,const char *packet, size_t len)
static int ma_net_write_buff(NET *net,const char *packet, size_t len)
{
size_t left_length;
@@ -299,8 +296,7 @@ unsigned char *mysql_net_store_length(unsigned char *packet, size_t length);
/* Read and write using timeouts */
int
ma_net_real_write(NET *net,const char *packet,size_t len)
int ma_net_real_write(NET *net, const char *packet, size_t len)
{
ssize_t length;
char *pos,*end;
@@ -359,8 +355,7 @@ ma_net_real_write(NET *net,const char *packet,size_t len)
/*****************************************************************************
** Read something from server/clinet
*****************************************************************************/
static ulong
ma_real_read(NET *net, size_t *complen)
static ulong ma_real_read(NET *net, size_t *complen)
{
uchar *pos;
ssize_t length;
@@ -387,6 +382,7 @@ ma_real_read(NET *net, size_t *complen)
remain -= (ulong) length;
pos+= (ulong) length;
}
if (i == 0)
{ /* First parts is packet length */
ulong helping;
@@ -585,6 +581,7 @@ int net_add_multi_command(NET *net, uchar command, const uchar *packet,
{
return(1);
}
/* don't increase packet number */
net->compress_pkt_nr= net->pkt_nr= 0;
return ma_net_write_command(net, command, (const char *)packet, length, 1);
}

2
libmariadb/mariadb_lib.c
View File

@@ -193,7 +193,7 @@ restart:
my_set_error(mysql, net->last_errno == ER_NET_PACKET_TOO_LARGE ?
CR_NET_PACKET_TOO_LARGE:
CR_SERVER_LOST,
SQLSTATE_UNKNOWN, 0);
SQLSTATE_UNKNOWN, 0, errno);
return(packet_error);
}
if (net->read_pos[0] == 255)

3
unittest/libmariadb/bulk1.c
View File

@@ -129,12 +129,9 @@ static int bulk1(MYSQL *mysql)
mysql_free_result(res);
FAIL_IF(intval != array_size - 1, "Expected max value 1024");
/*
rc= mysql_query(mysql, "DROP TABLE IF EXISTS bulk1");
check_mysql_rc(rc, mysql);
*/
return OK;
}
static int bulk2(MYSQL *mysql)