diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-11-25 03:11:05 +0000 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2010-11-25 03:11:05 +0000 |
| commit | 3a15cb6ce92fe9e7172f51991317cfbeb5307966 (patch) | |
| tree | f70ac0f818d16f63f5455f8abb9c33c4cbffddbf /tests | |
| parent | 9ab7421b10c1809f826a05f28626226df57cd5e5 (diff) | |
| download | mariadb-git-3a15cb6ce92fe9e7172f51991317cfbeb5307966.tar.gz | |
Assorted post-merge fixes, clean-up, integration, compat with 5.6.
43233/55794.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index ed8031b3fc3..53e2ed1d082 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17125,7 +17125,7 @@ static void test_bug20023() /* Set MAX_JOIN_SIZE to the default value (-1). */ - DIE_IF(mysql_query(&con, "SET @@global.max_join_size = -1")); + DIE_IF(mysql_query(&con, "SET @@global.max_join_size = 18446744073709551615")); DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default")); /* Issue COM_CHANGE_USER. */ @@ -17156,7 +17156,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 = 18446744073709551615")); DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default")); /* Issue COM_CHANGE_USER. */ |