diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-07 11:25:47 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-07 11:25:47 +0200 |
| commit | abf07615394340cf8100afdb192b37d518cf3910 (patch) | |
| tree | ca9a1a82215627b05504ef9b583eb2a3925fe1fa /mysql-test/t/change_user.test | |
| parent | 6c2420ed3c0e074fc3b7f47ce00e7ce220906e2c (diff) | |
| parent | bfbea4f4b40948621213aad712781b64cc80186f (diff) | |
| download | mariadb-git-abf07615394340cf8100afdb192b37d518cf3910.tar.gz | |
Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel
client/mysqltest.c:
Auto merged
mysql-test/r/change_user.result:
Auto merged
mysql-test/t/change_user.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_test.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'mysql-test/t/change_user.test')
| -rw-r--r-- | mysql-test/t/change_user.test | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/change_user.test b/mysql-test/t/change_user.test index 82aeb4da4af..4a9c22bcf29 100644 --- a/mysql-test/t/change_user.test +++ b/mysql-test/t/change_user.test @@ -4,17 +4,22 @@ --echo Bug#20023 SELECT @@session.sql_big_selects; +--replace_result 18446744073709551615 MAX_JOIN_SIZE 4294967295 MAX_JOIN_SIZE SELECT @@global.max_join_size; --echo change_user --change_user SELECT @@session.sql_big_selects; +--replace_result 18446744073709551615 MAX_JOIN_SIZE 4294967295 MAX_JOIN_SIZE 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; +# On some machines the following will result into a warning +--disable_warnings SET @@global.max_join_size = -1; +--enable_warnings SET @@session.max_join_size = default; --echo change_user --change_user |