hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

release-1.0beta update

Browse Source
This commit is contained in:
MassimilianoPinto 2014-07-29 10:26:11 +02:00
commit bb9893b488
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maxscale.spec
View File

@ -14,10 +14,20 @@ Source: %{name}-%{version}-%{release}.tar.gz
Prefix: /
Group: Development/Tools
#Requires:
BuildRequires: gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool openssl-devel libaio libaio-devel MariaDB-devel MariaDB-server
%if 0%{?suse_version}
BuildRequires: gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc_s1 perl make libtool libopenssl-devel libaio libaio-devel mariadb libedit-devel
%else
BuildRequires: gcc gcc-c++ ncurses-devel bison glibc-devel cmake libgcc perl make libtool openssl-devel libaio libaio-devel
%if 0%{?rhel} == 6
BuildRequires: libedit-devel
%endif
%endif
%if 0%{?rhel} == 7
BuildRequires: mariadb-devel mariadb-embedded-devel libedit-devel
%else
BuildRequires: MariaDB-devel MariaDB-server
%endif
%endif
%description
MaxScale

10
server/core/modutil.c
View File

@ -68,7 +68,7 @@ unsigned char *ptr;
int
modutil_extract_SQL(GWBUF *buf, char **sql, int *length)
{
char *ptr;
unsigned char *ptr;
if (!modutil_is_SQL(buf))
return 0;
@ -78,7 +78,7 @@ char *ptr;
*length += (*ptr++ << 8);
ptr += 2; // Skip sequence id and COM_QUERY byte
*length = *length - 1;
*sql = ptr;
*sql = (char *) ptr;
return 1;
}
@ -103,7 +103,7 @@ char *ptr;
int
modutil_MySQL_Query(GWBUF *buf, char **sql, int *length, int *residual)
{
char *ptr;
unsigned char *ptr;
if (!modutil_is_SQL(buf))
return 0;
@ -115,7 +115,7 @@ char *ptr;
*residual = *residual - 1;
*length = GWBUF_LENGTH(buf) - 5;
*residual -= *length;
*sql = ptr;
*sql = (char *)ptr;
return 1;
}
@ -133,7 +133,7 @@ char *ptr;
GWBUF *
modutil_replace_SQL(GWBUF *orig, char *sql)
{
char *ptr;
unsigned char *ptr;
int length, newlength;
GWBUF *addition;