diff options
| author | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-28 12:14:27 +0200 |
|---|---|---|
| committer | unknown <jani@a88-113-38-195.elisa-laajakaista.fi> | 2008-03-28 12:14:27 +0200 |
| commit | 01a979e8b21b82d0e21292140852a1f6b99d2ac8 (patch) | |
| tree | 08ecfa85ad2a82409ad7feb221fbe2f63208803d /mysql-test/t/change_user.test | |
| parent | 0cf83bbf56f13c4391e557cee5271259aff64d19 (diff) | |
| parent | 3a5a7ef44c600ab6265821945ce3ca53a5801270 (diff) | |
| download | mariadb-git-01a979e8b21b82d0e21292140852a1f6b99d2ac8.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/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
include/my_global.h:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql/ha_partition.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/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_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/unireg.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
storage/myisam/mi_dynrec.c:
Auto merged
storage/myisam/mi_open.c:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
include/config-win.h:
Manual merge between main 5.1 and 5.1 marvel.
mysql-test/r/change_user.result:
Manual merge between main 5.1 and 5.1 marvel.
mysql-test/t/change_user.test:
Manual merge between main 5.1 and 5.1 marvel.
sql/sql_plugin.cc:
Manual merge between main 5.1 and 5.1 marvel.
Diffstat (limited to 'mysql-test/t/change_user.test')
| -rw-r--r-- | mysql-test/t/change_user.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/t/change_user.test b/mysql-test/t/change_user.test index 685b6272482..f200c76196c 100644 --- a/mysql-test/t/change_user.test +++ b/mysql-test/t/change_user.test @@ -5,20 +5,20 @@ --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 +--replace_result 18446744073709551615 HA_POS_ERROR 4294967295 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 +--replace_result 18446744073709551615 HA_POS_ERROR 4294967295 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 +# On some machines the following will result into a warning --disable_warnings SET @@global.max_join_size = -1; --enable_warnings |