summaryrefslogtreecommitdiff
path: root/mysql-test/suite
diff options
context:
space:
mode:
authorunknown <sanja@askmonty.org>2011-09-02 15:10:10 +0300
committerunknown <sanja@askmonty.org>2011-09-02 15:10:10 +0300
commitb152c4c71dff8b2142e220850d9329fe63f4cfbd (patch)
tree585b0d57da5c535a64dc5393a268e2d4c81c2066 /mysql-test/suite
parentea8aa329099ee28ec6f1266d8d01a6fc664259cf (diff)
parent37a8497d494ea256ff4b13a89e62150e06a17dae (diff)
downloadmariadb-git-b152c4c71dff8b2142e220850d9329fe63f4cfbd.tar.gz
Merge 5.2->5.3
Diffstat (limited to 'mysql-test/suite')
-rw-r--r--mysql-test/suite/maria/r/maria3.result1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/maria/r/maria3.result b/mysql-test/suite/maria/r/maria3.result
index 056147c69c0..47c02999087 100644
--- a/mysql-test/suite/maria/r/maria3.result
+++ b/mysql-test/suite/maria/r/maria3.result
@@ -305,6 +305,7 @@ select lower(variable_name) as Variable_name, Variable_value as Value from infor
Variable_name Value
aria_block_size 8192
aria_checkpoint_interval 30
+aria_checkpoint_log_activity 1048576
aria_force_start_after_recovery_failures 0
aria_group_commit none
aria_group_commit_interval 0