diff options
| author | Michael Widenius <monty@askmonty.org> | 2013-06-06 15:14:23 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2013-06-06 15:14:23 +0300 |
| commit | 5730786041237db73e330ca388c98561ade8c43c (patch) | |
| tree | 4f94b267ab6fd3c6133f9e1d78232ced0f49af83 /storage/sphinx | |
| parent | bef95a4bbea0a3a42ad26798d3c3aa326dc282bf (diff) | |
| download | mariadb-git-5730786041237db73e330ca388c98561ade8c43c.tar.gz | |
Fixed some cache variables that could be set to higher value than what the code supported (size_t)
Fixed some cases that didn't work with > 4G buffers.
Fixed compiler warnings
include/mysql_com.h:
Avoid compiler warning with strncmp()
sql-common/client.c:
Fixed long comment; Added ()
sql/filesort.cc:
Fix code to get filesort to work with big buffers
sql/sys_vars.cc:
Fixed some cache variables that could be set to higher value than the size_t
Limit query cache to ULONG_MAX as the query cache buffer variables are ulong
storage/federatedx/ha_federatedx.cc:
Remove not used variable
storage/maria/ha_maria.cc:
Fix that bulk_insert() works with big buffers
storage/maria/ma_write.c:
Fix that bulk_insert() works with big buffers
storage/myisam/ha_myisam.cc:
Fix that bulk_insert() works with big buffers
storage/myisam/mi_write.c:
Fix that bulk_insert() works with big buffers
storage/sphinx/snippets_udf.cc:
Fixed compiler warnings
Diffstat (limited to 'storage/sphinx')
| -rw-r--r-- | storage/sphinx/snippets_udf.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/storage/sphinx/snippets_udf.cc b/storage/sphinx/snippets_udf.cc index 5318592ab5f..785b0ea6d97 100644 --- a/storage/sphinx/snippets_udf.cc +++ b/storage/sphinx/snippets_udf.cc @@ -180,7 +180,7 @@ enum #define SPHINXSE_DEFAULT_SCHEME "sphinx" #define SPHINXSE_DEFAULT_HOST "127.0.0.1" #define SPHINXSE_DEFAULT_PORT 9312 -#define SPHINXSE_DEFAULT_INDEX "*" +#define SPHINXSE_DEFAULT_INDEX (char*) "*" class CSphBuffer { @@ -244,9 +244,9 @@ struct CSphUrl char * m_sBuffer; char * m_sFormatted; - char * m_sScheme; + const char * m_sScheme; char * m_sHost; - char * m_sIndex; + char * m_sIndex; int m_iPort; @@ -254,7 +254,7 @@ struct CSphUrl : m_sBuffer ( NULL ) , m_sFormatted ( NULL ) , m_sScheme ( SPHINXSE_DEFAULT_SCHEME ) - , m_sHost ( SPHINXSE_DEFAULT_HOST ) + , m_sHost ( (char*) SPHINXSE_DEFAULT_HOST ) , m_sIndex ( SPHINXSE_DEFAULT_INDEX ) , m_iPort ( SPHINXSE_DEFAULT_PORT ) {} @@ -446,7 +446,7 @@ int CSphUrl::Connect() uint uServerVersion; uint uClientVersion = htonl ( SPHINX_SEARCHD_PROTO ); int iSocket = -1; - char * pError = NULL; + const char * pError = NULL; do { iSocket = socket ( iDomain, SOCK_STREAM, 0 ); |