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 /sql/ha_myisam.cc | |
| 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 'sql/ha_myisam.cc')
| -rw-r--r-- | sql/ha_myisam.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc index 0198929033e..6b88656dd76 100644 --- a/sql/ha_myisam.cc +++ b/sql/ha_myisam.cc @@ -39,7 +39,7 @@ const char *myisam_recover_names[] = TYPELIB myisam_recover_typelib= {array_elements(myisam_recover_names)-1,"", myisam_recover_names, NULL}; -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, "", |