diff options
| author | unknown <istruewing@synthia.local> | 2007-08-13 20:45:36 +0200 |
|---|---|---|
| committer | unknown <istruewing@synthia.local> | 2007-08-13 20:45:36 +0200 |
| commit | 195cecd746794a792ad95c882b75401ba3417e12 (patch) | |
| tree | d68ccfe3c0fb4975edbbdf21f45a5d809d13994e /myisam | |
| parent | d55d5bd69d0dd9e03b176ce9f34202c6b0e277b9 (diff) | |
| parent | e6701d746df9f4ed778fac78870c6639e4c84880 (diff) | |
| download | mariadb-git-195cecd746794a792ad95c882b75401ba3417e12.tar.gz | |
Merge synthia.local:/home/mydev/mysql-5.0-amain
into synthia.local:/home/mydev/mysql-5.0-axmrg
Diffstat (limited to 'myisam')
| -rwxr-xr-x | myisam/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/myisam/CMakeLists.txt b/myisam/CMakeLists.txt index 94a7ffc9952..a557d61b87f 100755 --- a/myisam/CMakeLists.txt +++ b/myisam/CMakeLists.txt @@ -30,16 +30,16 @@ ADD_LIBRARY(myisam ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c f rt_split.c sort.c sp_key.c ft_eval.h myisamdef.h rt_index.h mi_rkey.c) ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c) -TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisamchk myisamchk.c) -TARGET_LINK_LIBRARIES(myisamchk myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisamchk myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisamlog myisamlog.c) -TARGET_LINK_LIBRARIES(myisamlog myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisamlog myisam mysys debug dbug strings zlib wsock32) ADD_EXECUTABLE(myisampack myisampack.c) -TARGET_LINK_LIBRARIES(myisampack myisam mysys dbug strings zlib wsock32) +TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib wsock32) IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("myisam_ftdump" "asInvoker") diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 0332644c5a6..d0117e12ede 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -337,7 +337,7 @@ static struct my_option my_long_options[] = (gptr*) &ft_stopword_file, (gptr*) &ft_stopword_file, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"stats_method", OPT_STATS_METHOD, - "Specifies how index statistics collection code should threat NULLs. " + "Specifies how index statistics collection code should treat NULLs. " "Possible values of name are \"nulls_unequal\" (default behavior for 4.1/5.0), " "\"nulls_equal\" (emulate 4.0 behavior), and \"nulls_ignored\".", (gptr*) &myisam_stats_method_str, (gptr*) &myisam_stats_method_str, 0, @@ -452,7 +452,7 @@ static void usage(void) MySQL faster. You can check the calculated distribution\n\ by using '--description --verbose table_name'.\n\ --stats_method=name Specifies how index statistics collection code should\n\ - threat NULLs. Possible values of name are \"nulls_unequal\"\n\ + treat NULLs. Possible values of name are \"nulls_unequal\"\n\ (default for 4.1/5.0), \"nulls_equal\" (emulate 4.0), and \n\ \"nulls_ignored\".\n\ -d, --description Prints some information about table.\n\ |