summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help-notwin.result
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mysql.com>2009-12-24 12:30:23 +0100
committerSergei Golubchik <serg@mysql.com>2009-12-24 12:30:23 +0100
commitb4a39aeb5d491c4acc11ebc440554becff7bac3a (patch)
tree946ea113291960b21c67277e4da4851dee1bee7b /mysql-test/r/mysqld--help-notwin.result
parentdec9ad1e25163ac02222b4f1c9a6928119f58f30 (diff)
downloadmariadb-git-b4a39aeb5d491c4acc11ebc440554becff7bac3a.tar.gz
slightly more complete mysqld--help test
Diffstat (limited to 'mysql-test/r/mysqld--help-notwin.result')
-rw-r--r--mysql-test/r/mysqld--help-notwin.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/mysqld--help-notwin.result b/mysql-test/r/mysqld--help-notwin.result
index 623b4a119e4..85c0ea7bd6c 100644
--- a/mysql-test/r/mysqld--help-notwin.result
+++ b/mysql-test/r/mysqld--help-notwin.result
@@ -744,12 +744,14 @@ bulk-insert-buffer-size 8388608
character-set-client-handshake TRUE
character-set-filesystem binary
character-set-server latin1
+character-sets-dir MYSQL_SHAREDIR/charsets/
chroot (No default value)
collation-server latin1_swedish_ci
completion-type NO_CHAIN
concurrent-insert AUTO
connect-timeout 10
console FALSE
+datadir MYSQLTEST_VARDIR/install.db/
date-format %Y-%m-%d
datetime-format %Y-%m-%d %H:%i:%s
default-character-set latin1
@@ -793,8 +795,10 @@ key-buffer-size 8388608
key-cache-age-threshold 300
key-cache-block-size 1024
key-cache-division-limit 100
+language MYSQL_SHAREDIR/
large-pages FALSE
lc-messages en_US
+lc-messages-dir MYSQL_SHAREDIR/
lc-time-names en_US
local-infile TRUE
log-bin (No default value)
@@ -861,6 +865,7 @@ optimizer-prune-level 1
optimizer-search-depth 62
optimizer-switch index_merge=on,index_merge_union=on,index_merge_sort_union=on,index_merge_intersection=on
partition ON
+plugin-dir MYSQL_LIBDIR/mysql/plugin
plugin-load (No default value)
port 3306
port-open-timeout 0
@@ -901,6 +906,7 @@ skip-show-database FALSE
skip-slave-start FALSE
slave-compressed-protocol FALSE
slave-exec-mode STRICT
+slave-load-tmpdir MYSQLTEST_VARDIR/tmp/
slave-net-timeout 3600
slave-skip-errors (No default value)
slave-transaction-retries 10
@@ -934,6 +940,7 @@ thread-stack 262144
time-format %H:%i:%s
timed-mutexes FALSE
tmp-table-size 16777216
+tmpdir MYSQLTEST_VARDIR/tmp/
transaction-alloc-block-size 8192
transaction-isolation REPEATABLE-READ
transaction-prealloc-size 4096