diff options
author | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@fedora12> | 2009-12-25 16:49:21 +0100 |
commit | 16ebad8bb068bff9238d854c29f3ad2f115bec5d (patch) | |
tree | 7759e1bcb9d4f5273bfcaada45aac3885f5cd8fe /tests/mysql_client_test.c | |
parent | 354a628e54692d958e05863e80d4682dbb5d63bf (diff) | |
parent | 9016688fca04deb8f838f83269fd9b99c88aa5ac (diff) | |
download | mariadb-git-16ebad8bb068bff9238d854c29f3ad2f115bec5d.tar.gz |
merge
Diffstat (limited to 'tests/mysql_client_test.c')
-rw-r--r-- | tests/mysql_client_test.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 007522589e1..1b7fc76c300 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17692,9 +17692,9 @@ static void test_bug20023() SQL_BIG_SELECTS will be 1. ***********************************************************************/ - /* Set MAX_JOIN_SIZE to the default value (-1). */ + /* Set MAX_JOIN_SIZE to the default value (2^64-1). */ - DIE_IF(mysql_query(&con, "SET @@global.max_join_size = -1")); + DIE_IF(mysql_query(&con, "SET @@global.max_join_size = cast(-1 as unsigned int)")); DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default")); /* Issue COM_CHANGE_USER. */ @@ -17725,7 +17725,7 @@ static void test_bug20023() DIE_IF(mysql_query(&con, query_buffer)); - DIE_IF(mysql_query(&con, "SET @@global.max_join_size = -1")); + DIE_IF(mysql_query(&con, "SET @@global.max_join_size = cast(-1 as unsigned int)")); DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default")); /* Issue COM_CHANGE_USER. */ |