diff options
author | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
---|---|---|
committer | Michael Widenius <monty@askmonty.org> | 2011-03-09 15:47:59 +0200 |
commit | 139a2b64bf8ec2e248656835e23a5c98ffc667a8 (patch) | |
tree | 7d77d6f1073f8090f275b30cb3f10254497da243 /mysql-test/r/change_user.result | |
parent | b3f7eac5301529c2d069ebe4d0558980412af3a2 (diff) | |
parent | ce675406ca8dbc1532a908803a1371de8432d466 (diff) | |
download | mariadb-git-139a2b64bf8ec2e248656835e23a5c98ffc667a8.tar.gz |
Merge with 5.2
Diffstat (limited to 'mysql-test/r/change_user.result')
-rw-r--r-- | mysql-test/r/change_user.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result index 3c1e2b6f262..18c53a5e22b 100644 --- a/mysql-test/r/change_user.result +++ b/mysql-test/r/change_user.result @@ -51,7 +51,7 @@ change_user SELECT @@session.sql_big_selects; @@session.sql_big_selects 0 -SET @@global.max_join_size = -1; +SET @@global.max_join_size = 18446744073709551615; SET @@session.max_join_size = default; change_user SELECT @@session.sql_big_selects; |