summaryrefslogtreecommitdiff
path: root/mysql-test/r/variables.result
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2005-09-19 22:08:22 -0700
committerunknown <brian@zim.(none)>2005-09-19 22:08:22 -0700
commit91fbe52bf95fe06b553eca482e57fc20348cd531 (patch)
tree256b0374a45c6d029ef1be8969fdbb16bbdde2d2 /mysql-test/r/variables.result
parent7a1cc524330aa13fc69e95ce5a5f993e28b9e7de (diff)
downloadmariadb-git-91fbe52bf95fe06b553eca482e57fc20348cd531.tar.gz
Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code.
mysql-test/r/ps_1general.result: Redoing test output with straightened up output for storage engine names. mysql-test/r/variables.result: Fixed test case. sql/handler.cc: Couple of format cleanups and a change in a comment.
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 265f353ae3c..30ebeb462df 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -147,7 +147,7 @@ Variable_name Value
storage_engine MEMORY
show global variables like 'storage_engine';
Variable_name Value
-storage_engine MERGE
+storage_engine MRG_MYISAM
set GLOBAL query_cache_size=100000;
set GLOBAL myisam_max_sort_file_size=2000000;
show global variables like 'myisam_max_sort_file_size';