diff options
| author | unknown <sergefp@mysql.com> | 2005-09-24 02:39:52 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-24 02:39:52 +0400 |
| commit | 5f01a330bbcac84f33133fb13fa3e952ab1e544d (patch) | |
| tree | 4d3059fac0bd44cfc43758df9764ecb824bf9ace /myisam | |
| parent | 9448683059d21bf820660e31b9515a49cba44023 (diff) | |
| parent | 5559c48e182e40cfd052a29e875514761994333d (diff) | |
| download | mariadb-git-5f01a330bbcac84f33133fb13fa3e952ab1e544d.tar.gz | |
Manually merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/func_in.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Manually merged.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_check.c | 2 | ||||
| -rw-r--r-- | myisam/myisamchk.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/myisam/mi_check.c b/myisam/mi_check.c index 1f453278eea..79fafd0cf5b 100644 --- a/myisam/mi_check.c +++ b/myisam/mi_check.c @@ -3994,7 +3994,7 @@ void update_auto_increment_key(MI_CHECK *param, MI_INFO *info, ... The 'unique' array is collected in one sequential scan through the entire index. This is done in two places: in chk_index() and in sort_key_write(). - Statistics collection may consider NULLs as either equal or inequal (see + Statistics collection may consider NULLs as either equal or unequal (see SEARCH_NULL_ARE_NOT_EQUAL, MI_STATS_METHOD_*). Output is an array: diff --git a/myisam/myisamchk.c b/myisam/myisamchk.c index 10308408b1f..4fc0e560911 100644 --- a/myisam/myisamchk.c +++ b/myisam/myisamchk.c @@ -67,7 +67,7 @@ static const char *field_pack[]= "no zeros", "blob", "constant", "table-lockup", "always zero","varchar","unique-hash","?","?"}; -static const char *myisam_stats_method_str="nulls_inequal"; +static const char *myisam_stats_method_str="nulls_unequal"; static void get_options(int *argc,char * * *argv); static void print_version(void); @@ -339,7 +339,7 @@ static struct my_option my_long_options[] = REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, {"stats_method", OPT_STATS_METHOD, "Specifies how index statistics collection code should threat NULLs. " - "Possible values of name are \"nulls_inequal\" (default behavior for 4.1/5.0), and \"nulls_equal\" (emulate 4.0 behavior).", + "Possible values of name are \"nulls_unequal\" (default behavior for 4.1/5.0), and \"nulls_equal\" (emulate 4.0 behavior).", (gptr*) &myisam_stats_method_str, (gptr*) &myisam_stats_method_str, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0}, { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0} @@ -471,7 +471,7 @@ static void usage(void) #include <help_end.h> -const char *myisam_stats_method_names[] = {"nulls_inequal", "nulls_equal", +const char *myisam_stats_method_names[] = {"nulls_unequal", "nulls_equal", NullS}; TYPELIB myisam_stats_method_typelib= { array_elements(myisam_stats_method_names) - 1, "", |