summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
authorpatg@radha.local <>2005-08-19 23:44:40 +0200
committerpatg@radha.local <>2005-08-19 23:44:40 +0200
commit7a43a0f54dc350daf27d49277256440b9584f891 (patch)
tree551b262f942de7c0a7588800997e133c10fec40c /sql/mysqld.cc
parentd9efe655ed8f0377725ace8912f0123175d4099d (diff)
parentd0767dfad3b9c12f50b0564e29f6d8dd284e5007 (diff)
downloadmariadb-git-7a43a0f54dc350daf27d49277256440b9584f891.tar.gz
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 55995a71980..2e38ec98c08 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -4328,7 +4328,7 @@ Disable with --skip-bdb (will save memory).",
(gptr*) &default_collation_name, (gptr*) &default_collation_name,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
{"default-storage-engine", OPT_STORAGE_ENGINE,
- "Set the default storage engine (table tyoe) for tables.", 0, 0,
+ "Set the default storage engine (table type) for tables.", 0, 0,
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
{"default-table-type", OPT_STORAGE_ENGINE,
"(deprecated) Use --default-storage-engine.", 0, 0,