[Commits] df53e02: test fix

OleksandrByelkin sanja at mariadb.com
Fri Dec 18 12:26:00 EET 2015


revision-id: df53e027f2fb8a09e98e8e4f4ca9cc1d81050dcd (mariadb-10.1.9-21-gdf53e02)
parent(s): 46c4df07a8227cc3ddbf0ce3b3f8ac1d955c4ecc
committer: Oleksandr Byelkin
timestamp: 2015-12-18 11:26:00 +0100
message:

test fix

---
 mysql-test/r/analyze.result                     |  2 +
 mysql-test/r/mysqlcheck.result                  | 60 ++++++++++++++++++++-----
 mysql-test/r/statistics_index_crash-7362.result |  2 +
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/mysql-test/r/analyze.result b/mysql-test/r/analyze.result
index 9dff94a..5a05d1c 100644
--- a/mysql-test/r/analyze.result
+++ b/mysql-test/r/analyze.result
@@ -34,9 +34,11 @@ create table t1 (a mediumtext, fulltext key key1(a)) charset utf8 collate utf8_g
 insert into t1 values ('hello');
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'a'
 test.t1	analyze	status	OK
 analyze table t1;
 Table	Op	Msg_type	Msg_text
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'a'
 test.t1	analyze	status	Table is already up to date
 drop table t1;
 CREATE TABLE t1 (a int);
diff --git a/mysql-test/r/mysqlcheck.result b/mysql-test/r/mysqlcheck.result
index 7d646dc..e69653f 100644
--- a/mysql-test/r/mysqlcheck.result
+++ b/mysql-test/r/mysqlcheck.result
@@ -7,19 +7,34 @@ mtr.test_suppressions                              OK
 mysql.column_stats                                 OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
-mysql.event                                        OK
+mysql.event
+Warning  : Engine-independent statistics are not collected for column 'body'
+Warning  : Engine-independent statistics are not collected for column 'body_utf8'
+status   : OK
 mysql.func                                         OK
 mysql.gtid_slave_pos                               OK
-mysql.help_category                                OK
+mysql.help_category
+Warning  : Engine-independent statistics are not collected for column 'url'
+status   : OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
-mysql.help_topic                                   OK
+mysql.help_topic
+Warning  : Engine-independent statistics are not collected for column 'description'
+Warning  : Engine-independent statistics are not collected for column 'example'
+Warning  : Engine-independent statistics are not collected for column 'url'
+status   : OK
 mysql.host                                         OK
 mysql.index_stats                                  OK
 mysql.innodb_index_stats                           OK
 mysql.innodb_table_stats                           OK
 mysql.plugin                                       OK
-mysql.proc                                         OK
+mysql.proc
+Warning  : Engine-independent statistics are not collected for column 'param_list'
+Warning  : Engine-independent statistics are not collected for column 'returns'
+Warning  : Engine-independent statistics are not collected for column 'body'
+Warning  : Engine-independent statistics are not collected for column 'comment'
+Warning  : Engine-independent statistics are not collected for column 'body_utf8'
+status   : OK
 mysql.procs_priv                                   OK
 mysql.proxies_priv                                 OK
 mysql.roles_mapping                                OK
@@ -31,7 +46,12 @@ mysql.time_zone_leap_second                        OK
 mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
-mysql.user                                         OK
+mysql.user
+Warning  : Engine-independent statistics are not collected for column 'ssl_cipher'
+Warning  : Engine-independent statistics are not collected for column 'x509_issuer'
+Warning  : Engine-independent statistics are not collected for column 'x509_subject'
+Warning  : Engine-independent statistics are not collected for column 'authentication_string'
+status   : OK
 mtr.global_suppressions                            Table is already up to date
 mtr.test_suppressions                              Table is already up to date
 mysql.column_stats                                 OK
@@ -69,19 +89,34 @@ mysql.user                                         OK
 mysql.column_stats                                 OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
-mysql.event                                        OK
+mysql.event
+Warning  : Engine-independent statistics are not collected for column 'body'
+Warning  : Engine-independent statistics are not collected for column 'body_utf8'
+status   : OK
 mysql.func                                         OK
 mysql.gtid_slave_pos                               OK
-mysql.help_category                                OK
+mysql.help_category
+Warning  : Engine-independent statistics are not collected for column 'url'
+status   : OK
 mysql.help_keyword                                 OK
 mysql.help_relation                                OK
-mysql.help_topic                                   OK
+mysql.help_topic
+Warning  : Engine-independent statistics are not collected for column 'description'
+Warning  : Engine-independent statistics are not collected for column 'example'
+Warning  : Engine-independent statistics are not collected for column 'url'
+status   : OK
 mysql.host                                         OK
 mysql.index_stats                                  OK
 mysql.innodb_index_stats                           OK
 mysql.innodb_table_stats                           OK
 mysql.plugin                                       OK
-mysql.proc                                         OK
+mysql.proc
+Warning  : Engine-independent statistics are not collected for column 'param_list'
+Warning  : Engine-independent statistics are not collected for column 'returns'
+Warning  : Engine-independent statistics are not collected for column 'body'
+Warning  : Engine-independent statistics are not collected for column 'comment'
+Warning  : Engine-independent statistics are not collected for column 'body_utf8'
+status   : OK
 mysql.procs_priv                                   OK
 mysql.proxies_priv                                 OK
 mysql.roles_mapping                                OK
@@ -93,7 +128,12 @@ mysql.time_zone_leap_second                        OK
 mysql.time_zone_name                               OK
 mysql.time_zone_transition                         OK
 mysql.time_zone_transition_type                    OK
-mysql.user                                         OK
+mysql.user
+Warning  : Engine-independent statistics are not collected for column 'ssl_cipher'
+Warning  : Engine-independent statistics are not collected for column 'x509_issuer'
+Warning  : Engine-independent statistics are not collected for column 'x509_subject'
+Warning  : Engine-independent statistics are not collected for column 'authentication_string'
+status   : OK
 mysql.column_stats                                 Table is already up to date
 mysql.columns_priv                                 Table is already up to date
 mysql.db                                           Table is already up to date
diff --git a/mysql-test/r/statistics_index_crash-7362.result b/mysql-test/r/statistics_index_crash-7362.result
index 99f65d7..c213fa4 100644
--- a/mysql-test/r/statistics_index_crash-7362.result
+++ b/mysql-test/r/statistics_index_crash-7362.result
@@ -3,6 +3,7 @@ INSERT INTO t1 VALUES (unhex('3E0D0A4141414142334E7A6143317963324541414141424977
 ANALYZE TABLE t1 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'a'
 test.t1	analyze	status	OK
 SELECT * FROM mysql.index_stats WHERE index_name='a' AND table_name='t1';
 db_name	table_name	index_name	prefix_arity	avg_frequency
@@ -13,6 +14,7 @@ INSERT INTO t1 VALUES (unhex('3E0D0A4141414142334E7A6143317963324541414141424977
 ANALYZE TABLE t1 PERSISTENT FOR ALL;
 Table	Op	Msg_type	Msg_text
 test.t1	analyze	status	Engine-independent statistics collected
+test.t1	analyze	Warning	Engine-independent statistics are not collected for column 'a'
 test.t1	analyze	status	OK
 SELECT * FROM mysql.index_stats WHERE index_name='a' AND table_name='t1';
 db_name	table_name	index_name	prefix_arity	avg_frequency


More information about the commits mailing list