summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-09-11 06:40:08 +0300
committermonty@mashka.mysql.fi <>2002-09-11 06:40:08 +0300
commitf3a186c90566602c18b5fca95f19f92374c06b64 (patch)
tree6ef035adfec09ec1e444dd169712750e2de1efeb /mysql-test/r/variables.result
parent5ee7d7e73c5d97c53a435e544d3eb540f704e8c7 (diff)
downloadmariadb-git-f3a186c90566602c18b5fca95f19f92374c06b64.tar.gz
Portability fixes.
Improve mysql-test to be more robust. Fix that GRANT doesn't delete SSL options Change innobase_flush_log_at_trx_commit to uint. Don't rotate logs if we read a rotate log entry from the master.
Diffstat (limited to 'mysql-test/r/variables.result')
-rw-r--r--mysql-test/r/variables.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 516204028fe..f708ddd2ee7 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -65,7 +65,7 @@ Variable_name Value
max_join_size 4294967295
set @@max_join_size=1000, @@global.max_join_size=2000;
select @@local.max_join_size, @@global.max_join_size;
-@@max_join_size @@max_join_size
+@@session.max_join_size @@global.max_join_size
1000 2000
select @@identity, length(@@version)>0;
@@identity length(@@version)>0