summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2013-06-06 15:14:23 +0300
committerMichael Widenius <monty@askmonty.org>2013-06-06 15:14:23 +0300
commit5730786041237db73e330ca388c98561ade8c43c (patch)
tree4f94b267ab6fd3c6133f9e1d78232ced0f49af83 /sql-common
parentbef95a4bbea0a3a42ad26798d3c3aa326dc282bf (diff)
downloadmariadb-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 'sql-common')
-rw-r--r--sql-common/client.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index c81fe6a8a69..e77df80e146 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -3414,8 +3414,11 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
strmov(mysql->server_version,(char*) net->read_pos+1);
mysql->port=port;
- /* remove the rpl hack from the version string, see RPL_VERSION_HACK comment */
- if (mysql->server_capabilities & CLIENT_PLUGIN_AUTH &&
+ /*
+ remove the rpl hack from the version string,
+ see RPL_VERSION_HACK comment
+ */
+ if ((mysql->server_capabilities & CLIENT_PLUGIN_AUTH) &&
strncmp(mysql->server_version, RPL_VERSION_HACK,
sizeof(RPL_VERSION_HACK) - 1) == 0)
mysql->server_version+= sizeof(RPL_VERSION_HACK) - 1;