diff options
author | unknown <serg@janus.mylan> | 2007-12-28 00:15:29 +0100 |
---|---|---|
committer | unknown <serg@janus.mylan> | 2007-12-28 00:15:29 +0100 |
commit | 4140f76f4e50a0497c8d325fef7e255bb5cf4e68 (patch) | |
tree | ad7653284333477b8b2d0bcb4d2582cbbcb0e47e /mysql-test/r/change_user.result | |
parent | 7fdbc4230e68171e17e0dd4f6ae2d3fe3acb7549 (diff) | |
download | mariadb-git-4140f76f4e50a0497c8d325fef7e255bb5cf4e68.tar.gz |
after merge
include/mysql/plugin.h:
move declarations after merge
mysql-test/r/change_user.result:
more tests
mysql-test/t/change_user.test:
more tests
mysys/my_getopt.c:
remove wrong code
BitKeeper/etc/ignore:
Added libmysqld/sql_profile.cc to the ignore list
Diffstat (limited to 'mysql-test/r/change_user.result')
-rw-r--r-- | mysql-test/r/change_user.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/r/change_user.result b/mysql-test/r/change_user.result index 28b55dfd5e5..12e86a08f8d 100644 --- a/mysql-test/r/change_user.result +++ b/mysql-test/r/change_user.result @@ -24,6 +24,12 @@ change_user SELECT @@session.sql_big_selects; @@session.sql_big_selects 1 +SELECT @@global.max_join_size; +@@global.max_join_size +18446744073709551615 +SELECT @@session.max_join_size; +@@session.max_join_size +18446744073709551615 Bug#31418 SELECT IS_FREE_LOCK('bug31418'); IS_FREE_LOCK('bug31418') |