database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

4
storage/sphinx/snippets_udf.cc
View File

@ -449,7 +449,7 @@ int CSphUrl::Connect()
char * pError = NULL;
do
{
iSocket = socket ( iDomain, SOCK_STREAM, 0 );
iSocket = (int)socket ( iDomain, SOCK_STREAM, 0 );
if ( iSocket==-1 )
{
pError = "Failed to create client socket";
@ -641,7 +641,7 @@ struct CSphSnippets
}
#define STRING CHECK_TYPE(STRING_RESULT)
#define INT CHECK_TYPE(INT_RESULT); int iValue = *(long long *)pArgs->args[i]
#define INT CHECK_TYPE(INT_RESULT); int iValue =(int)*(long long *)pArgs->args[i]
my_bool sphinx_snippets_init ( UDF_INIT * pUDF, UDF_ARGS * pArgs, char * sMessage )
{