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 | 541edcc2e4a746908e508c6f997baf13c02aee89 (patch) | |
| tree | 7759e1bcb9d4f5273bfcaada45aac3885f5cd8fe /tests | |
| parent | 0940d7d2040f71686901bcc0cd708f562a9ee271 (diff) | |
| parent | 6c716007d13ffd74bb5c3dd7c512d4d7026a23d8 (diff) | |
| download | mariadb-git-541edcc2e4a746908e508c6f997baf13c02aee89.tar.gz | |
merge
Diffstat (limited to 'tests')
| -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. */ |