diff options
| author | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-10 08:20:33 +0100 |
|---|---|---|
| committer | unknown <tnurnberg@white.intern.koehntopp.de> | 2007-12-10 08:20:33 +0100 |
| commit | 76a5b3b976de1ad938ae46525f11992fcb392103 (patch) | |
| tree | b263f388005c953c660dc23231418f1760ed86a6 /tests | |
| parent | a7fa078141acd6cde43c9121de8d3df208374c3d (diff) | |
| parent | 1ebb563422e5650f80addc3adf08f88044b4b340 (diff) | |
| download | mariadb-git-76a5b3b976de1ad938ae46525f11992fcb392103.tar.gz | |
Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-opt
into mysql.com:/misc/mysql/31177/51-31177
tests/mysql_client_test.c:
Auto merged
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mysql_client_test.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c index 2f33e351620..92992aa3a2e 100644 --- a/tests/mysql_client_test.c +++ b/tests/mysql_client_test.c @@ -17001,6 +17001,12 @@ static void test_bug20023() Check that SQL_BIG_SELECTS will be the original one. ***********************************************************************/ +#if NOT_USED + /* + max_join_size is a ulong or better. + my_snprintf() only goes up to ul. + */ + /* Restore MAX_JOIN_SIZE. */ my_snprintf(query_buffer, @@ -17009,6 +17015,11 @@ static void test_bug20023() (int) max_join_size_orig); DIE_IF(mysql_query(&con, query_buffer)); + +#else + DIE_IF(mysql_query(&con, "SET @@global.max_join_size = -1")); +#endif + DIE_IF(mysql_query(&con, "SET @@session.max_join_size = default")); /* Issue COM_CHANGE_USER. */ |