summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <igor@rurik.mysql.com>2005-08-19 15:07:51 -0700
committerunknown <igor@rurik.mysql.com>2005-08-19 15:07:51 -0700
commita8031724acf5cd91039d089d8aefecae9b42d60f (patch)
tree93fccdad66be5667b22f64d4ebc3b7b78f34ad58
parent5ff24316d9e59bd60f285b14367f6ffcd3fa49cc (diff)
parent30e9a3ec984efdbdd5d5aafd3df045bb66c79b4f (diff)
downloadmariadb-git-a8031724acf5cd91039d089d8aefecae9b42d60f.tar.gz
Merge rurik.mysql.com:/home/igor/mysql-4.1
into rurik.mysql.com:/home/igor/dev/mysql-4.1-0
-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,