diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-04-10 17:43:18 +0300 |
| commit | 45e6d0aebf023acb50671f82b87e6de5d1e78f5e (patch) | |
| tree | c6079a18e158706a0a877d1b522ceb851d6055b5 /storage/sphinx | |
| parent | f5cb66fb97101bc0f17ff879025fd7146c032cbc (diff) | |
| parent | 2e91eb7547dfc7c9a999568bd8245832bbcfefaa (diff) | |
| download | mariadb-git-45e6d0aebf023acb50671f82b87e6de5d1e78f5e.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index 1eab4b4ed3d..edde806f682 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/storage/sphinx/snippets_udf.cc @@ -178,10 +178,10 @@ enum SEARCHD_WARNING = 3 ///< general success, warning message and command-specific reply follow }; -#define SPHINXSE_DEFAULT_SCHEME "sphinx" -#define SPHINXSE_DEFAULT_HOST "127.0.0.1" +#define SPHINXSE_DEFAULT_SCHEME (char*) "sphinx" +#define SPHINXSE_DEFAULT_HOST (char*) "127.0.0.1" #define SPHINXSE_DEFAULT_PORT 9312 -#define SPHINXSE_DEFAULT_INDEX "*" +#define SPHINXSE_DEFAULT_INDEX (char*) "*" class CSphBuffer { @@ -447,7 +447,7 @@ int CSphUrl::Connect() uint uServerVersion; uint uClientVersion = htonl ( SPHINX_SEARCHD_PROTO ); int iSocket = -1; - char * pError = NULL; + const char * pError = NULL; do { iSocket = (int)socket ( iDomain, SOCK_STREAM, 0 ); |