diff options
| author | unknown <kaa@kaamos.(none)> | 2008-03-19 12:18:16 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-03-19 12:18:16 +0300 |
| commit | 842fd8ba5e3e5c6f1d3f545a1e263e0582e02ddd (patch) | |
| tree | f26839c1289949340ac0c146fb7bda8e8815f654 /mysql-test/t/change_user.test | |
| parent | f467cbaf441b73e0962f602ec7ae8e4c8b8dc24b (diff) | |
| parent | 0ba100d3031d78631b9d56d439f0845887fc880e (diff) | |
| download | mariadb-git-842fd8ba5e3e5c6f1d3f545a1e263e0582e02ddd.tar.gz | |
Merge kaamos.(none):/data/src/opt/bug34650/my51
into kaamos.(none):/data/src/opt/mysql-5.1-opt
mysql-test/r/change_user.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/change_user.test:
Auto merged
Diffstat (limited to 'mysql-test/t/change_user.test')
| -rw-r--r-- | mysql-test/t/change_user.test | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/t/change_user.test b/mysql-test/t/change_user.test index 82aeb4da4af..685b6272482 100644 --- a/mysql-test/t/change_user.test +++ b/mysql-test/t/change_user.test @@ -4,17 +4,24 @@ --echo Bug#20023 SELECT @@session.sql_big_selects; +# The exact value depends on the server build flags +--replace_result 4294967295 HA_POS_ERROR 18446744073709551615 HA_POS_ERROR SELECT @@global.max_join_size; --echo change_user --change_user SELECT @@session.sql_big_selects; +# The exact value depends on the server build flags +--replace_result 4294967295 HA_POS_ERROR 18446744073709551615 HA_POS_ERROR SELECT @@global.max_join_size; SET @@global.max_join_size = 10000; SET @@session.max_join_size = default; --echo change_user --change_user SELECT @@session.sql_big_selects; +# May produce a warning depending on server build flags +--disable_warnings SET @@global.max_join_size = -1; +--enable_warnings SET @@session.max_join_size = default; --echo change_user --change_user |