diff options
| author | unknown <patg@radha.local> | 2005-08-19 23:44:40 +0200 |
|---|---|---|
| committer | unknown <patg@radha.local> | 2005-08-19 23:44:40 +0200 |
| commit | 30e9a3ec984efdbdd5d5aafd3df045bb66c79b4f (patch) | |
| tree | 551b262f942de7c0a7588800997e133c10fec40c /sql/mysqld.cc | |
| parent | 1b970e94e0a736a2056cb94cfcba0b50133da1d6 (diff) | |
| parent | cf312a782dd5d94f1abd7a4cd29486c65d93e76d (diff) | |
| download | mariadb-git-30e9a3ec984efdbdd5d5aafd3df045bb66c79b4f.tar.gz | |
Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.1
into radha.local:/Users/patg/mysql-build/mysql-4.1.clean
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 2 |
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, |