From dc64ba2187fa97d74ee465dd3ca234761b1be7c5 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Thu, 19 Jun 2014 12:02:23 +0200 Subject: MDEV-6137 better help for SET/ENUM sysvars Auto-generate the allowed list of values for enum/set/flagset options in --help output. But don't do that when the help text already has them. Also, remove lists of values from help strings of various options, where they were simply listed without any additional information. --- mysql-test/r/myisam.result | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mysql-test/r/myisam.result') diff --git a/mysql-test/r/myisam.result b/mysql-test/r/myisam.result index 3a6fa9a4673..a99aed61cd9 100644 --- a/mysql-test/r/myisam.result +++ b/mysql-test/r/myisam.result @@ -656,7 +656,7 @@ test.t2 984116287 drop table t1, t2; show variables like 'myisam_stats_method'; Variable_name Value -myisam_stats_method nulls_unequal +myisam_stats_method NULLS_UNEQUAL create table t1 (a int, key(a)); insert into t1 values (0),(1),(2),(3),(4); insert into t1 select NULL from t1; @@ -677,7 +677,7 @@ t1 1 a 1 a A 10 NULL NULL YES BTREE set myisam_stats_method=nulls_equal; show variables like 'myisam_stats_method'; Variable_name Value -myisam_stats_method nulls_equal +myisam_stats_method NULLS_EQUAL insert into t1 values (11); delete from t1 where a=11; analyze table t1; @@ -697,7 +697,7 @@ t1 1 a 1 a A 5 NULL NULL YES BTREE set myisam_stats_method=DEFAULT; show variables like 'myisam_stats_method'; Variable_name Value -myisam_stats_method nulls_unequal +myisam_stats_method NULLS_UNEQUAL insert into t1 values (11); delete from t1 where a=11; analyze table t1; @@ -718,7 +718,7 @@ drop table t1; set myisam_stats_method=nulls_ignored; show variables like 'myisam_stats_method'; Variable_name Value -myisam_stats_method nulls_ignored +myisam_stats_method NULLS_IGNORED create table t1 ( a char(3), b char(4), c char(5), d char(6), key(a,b,c,d) -- cgit v1.2.1