Skip to content

M
MariaDB
Commit cb0a5c84 authored by Igor Babaev's avatar Igor Babaev
Browse files
Options

Made the output of the newly added test cases from statistics.test 

platform independent.

Adjusted results of funcs_1.is_columns_mysql_embedded.
parent 47fae7f0
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 50 deletions
mysql-test/r/statistics.result
View file @ cb0a5c84
...@@ -1159,42 +1159,52 @@ WORLD_INNODB COUNTRYLANGUAGE PRIMARY 2 1.0000 ...@@ -1159,42 +1159,52 @@ WORLD_INNODB COUNTRYLANGUAGE PRIMARY 2 1.0000
WORLD_INNODB COUNTRYLANGUAGE Percentage 1 2.7640 WORLD_INNODB COUNTRYLANGUAGE Percentage 1 2.7640
use test; use test;
DROP DATABASE world; DROP DATABASE world;
SELECT * FROM mysql.table_stat; SELECT UPPER(db_name), UPPER(table_name), cardinality
db_name table_name cardinality FROM mysql.table_stat;
world_innodb Country 239 UPPER(db_name) UPPER(table_name) cardinality
world_innodb City 4079 WORLD_INNODB COUNTRY 239
world_innodb CountryLanguage 984 WORLD_INNODB CITY 4079
SELECT * FROM mysql.column_stat; WORLD_INNODB COUNTRYLANGUAGE 984
db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency SELECT UPPER(db_name), UPPER(table_name),
world_innodb Country Code ABW ZWE 0.0000 3.0000 1.0000 column_name, min_value, max_value, nulls_ratio, avg_length, avg_frequency
world_innodb Country Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000 FROM mysql.column_stat;
world_innodb Country SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042 UPPER(db_name) UPPER(table_name) column_name min_value max_value nulls_ratio avg_length avg_frequency
world_innodb Country Population 0 1277558000 0.0000 4.0000 1.0575 WORLD_INNODB COUNTRY Code ABW ZWE 0.0000 3.0000 1.0000
world_innodb Country Capital 1 4074 0.0293 4.0000 1.0000 WORLD_INNODB COUNTRY Name Afghanistan Zimbabwe 0.0000 10.1088 1.0000
world_innodb City ID 1 4079 0.0000 4.0000 1.0000 WORLD_INNODB COUNTRY SurfaceArea 0.40 17075400.00 0.0000 4.0000 1.0042
world_innodb City Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195 WORLD_INNODB COUNTRY Population 0 1277558000 0.0000 4.0000 1.0575
world_innodb City Country ABW ZWE 0.0000 3.0000 17.5819 WORLD_INNODB COUNTRY Capital 1 4074 0.0293 4.0000 1.0000
world_innodb City Population 42 10500000 0.0000 4.0000 1.0467 WORLD_INNODB CITY ID 1 4079 0.0000 4.0000 1.0000
world_innodb CountryLanguage Country ABW ZWE 0.0000 3.0000 4.2232 WORLD_INNODB CITY Name A Coruña (La Coruña) Ürgenc 0.0000 8.6416 1.0195
world_innodb CountryLanguage Language Abhyasi [South]Mande 0.0000 7.1778 2.1532 WORLD_INNODB CITY Country ABW ZWE 0.0000 3.0000 17.5819
world_innodb CountryLanguage Percentage 0.0 99.9 0.0000 4.0000 2.7640 WORLD_INNODB CITY Population 42 10500000 0.0000 4.0000 1.0467
SELECT * FROM mysql.index_stat; WORLD_INNODB COUNTRYLANGUAGE Country ABW ZWE 0.0000 3.0000 4.2232
db_name table_name index_name prefix_arity avg_frequency WORLD_INNODB COUNTRYLANGUAGE Language Abhyasi [South]Mande 0.0000 7.1778 2.1532
world_innodb Country PRIMARY 1 1.0000 WORLD_INNODB COUNTRYLANGUAGE Percentage 0.0 99.9 0.0000 4.0000 2.7640
world_innodb Country Name 1 1.0000 SELECT UPPER(db_name), UPPER(table_name),
world_innodb City PRIMARY 1 1.0000 index_name, prefix_arity, avg_frequency
world_innodb City Population 1 1.0467 FROM mysql.index_stat;
world_innodb City Country 1 17.5819 UPPER(db_name) UPPER(table_name) index_name prefix_arity avg_frequency
world_innodb CountryLanguage PRIMARY 1 4.2232 WORLD_INNODB COUNTRY PRIMARY 1 1.0000
world_innodb CountryLanguage PRIMARY 2 1.0000 WORLD_INNODB COUNTRY Name 1 1.0000
world_innodb CountryLanguage Percentage 1 2.7640 WORLD_INNODB CITY PRIMARY 1 1.0000
WORLD_INNODB CITY Population 1 1.0467
WORLD_INNODB CITY Country 1 17.5819
WORLD_INNODB COUNTRYLANGUAGE PRIMARY 1 4.2232
WORLD_INNODB COUNTRYLANGUAGE PRIMARY 2 1.0000
WORLD_INNODB COUNTRYLANGUAGE Percentage 1 2.7640
DROP DATABASE world_innodb; DROP DATABASE world_innodb;
SELECT * FROM mysql.table_stat; SELECT UPPER(db_name), UPPER(table_name), cardinality
db_name table_name cardinality FROM mysql.table_stat;
SELECT * FROM mysql.column_stat; UPPER(db_name) UPPER(table_name) cardinality
db_name table_name column_name min_value max_value nulls_ratio avg_length avg_frequency SELECT UPPER(db_name), UPPER(table_name),
SELECT * FROM mysql.index_stat; column_name, min_value, max_value, nulls_ratio, avg_length, avg_frequency
db_name table_name index_name prefix_arity avg_frequency FROM mysql.column_stat;
UPPER(db_name) UPPER(table_name) column_name min_value max_value nulls_ratio avg_length avg_frequency
SELECT UPPER(db_name), UPPER(table_name),
index_name, prefix_arity, avg_frequency
FROM mysql.index_stat;
UPPER(db_name) UPPER(table_name) index_name prefix_arity avg_frequency
DELETE FROM mysql.table_stat; DELETE FROM mysql.table_stat;
DELETE FROM mysql.column_stat; DELETE FROM mysql.column_stat;
DELETE FROM mysql.index_stat; DELETE FROM mysql.index_stat;
......
mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
View file @ cb0a5c84
...@@ -9,13 +9,13 @@ def mysql columns_priv Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char( ...@@ -9,13 +9,13 @@ def mysql columns_priv Host 1 NO char 60 180 NULL NULL NULL utf8 utf8_bin char(
def mysql columns_priv Table_name 4 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI def mysql columns_priv Table_name 4 NO char 64 192 NULL NULL NULL utf8 utf8_bin char(64) PRI
def mysql columns_priv Timestamp 6 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp on update CURRENT_TIMESTAMP def mysql columns_priv Timestamp 6 CURRENT_TIMESTAMP NO timestamp NULL NULL NULL NULL 0 NULL NULL timestamp on update CURRENT_TIMESTAMP
def mysql columns_priv User 3 NO char 16 48 NULL NULL NULL utf8 utf8_bin char(16) PRI def mysql columns_priv User 3 NO char 16 48 NULL NULL NULL utf8 utf8_bin char(16) PRI
def mysql column_stat avg_frequency 8 NULL YES double NULL NULL 22 NULL NULL NULL NULL double def mysql column_stat avg_frequency 8 NULL YES decimal NULL NULL 12 4 NULL NULL NULL decimal(12,4)
def mysql column_stat avg_length 7 NULL YES double NULL NULL 22 NULL NULL NULL NULL double def mysql column_stat avg_length 7 NULL YES decimal NULL NULL 12 4 NULL NULL NULL decimal(12,4)
def mysql column_stat column_name 3 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI def mysql column_stat column_name 3 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI
def mysql column_stat db_name 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI def mysql column_stat db_name 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI
def mysql column_stat max_value 5 NULL YES varchar 255 765 NULL NULL NULL utf8 utf8_bin varchar(255) def mysql column_stat max_value 5 NULL YES varchar 255 765 NULL NULL NULL utf8 utf8_bin varchar(255)
def mysql column_stat min_value 4 NULL YES varchar 255 765 NULL NULL NULL utf8 utf8_bin varchar(255) def mysql column_stat min_value 4 NULL YES varchar 255 765 NULL NULL NULL utf8 utf8_bin varchar(255)
def mysql column_stat nulls_ratio 6 NULL YES double NULL NULL 22 NULL NULL NULL NULL double def mysql column_stat nulls_ratio 6 NULL YES decimal NULL NULL 12 4 NULL NULL NULL decimal(12,4)
def mysql column_stat table_name 2 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI def mysql column_stat table_name 2 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI
def mysql db Alter_priv 13 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') def mysql db Alter_priv 13 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y')
def mysql db Alter_routine_priv 19 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') def mysql db Alter_routine_priv 19 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y')
...@@ -105,7 +105,7 @@ def mysql host Select_priv 3 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci e ...@@ -105,7 +105,7 @@ def mysql host Select_priv 3 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci e
def mysql host Show_view_priv 16 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') def mysql host Show_view_priv 16 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y')
def mysql host Trigger_priv 20 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') def mysql host Trigger_priv 20 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y')
def mysql host Update_priv 5 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y') def mysql host Update_priv 5 N NO enum 1 3 NULL NULL NULL utf8 utf8_general_ci enum('N','Y')
def mysql index_stat avg_frequency 5 NULL YES double NULL NULL 22 NULL NULL NULL NULL double def mysql index_stat avg_frequency 5 NULL YES decimal NULL NULL 12 4 NULL NULL NULL decimal(12,4)
def mysql index_stat db_name 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI def mysql index_stat db_name 1 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI
def mysql index_stat index_name 3 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI def mysql index_stat index_name 3 NULL NO varchar 64 192 NULL NULL NULL utf8 utf8_bin varchar(64) PRI
def mysql index_stat prefix_arity 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) unsigned PRI def mysql index_stat prefix_arity 4 NULL NO int NULL NULL 10 0 NULL NULL NULL int(11) unsigned PRI
...@@ -291,7 +291,7 @@ ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML; ...@@ -291,7 +291,7 @@ ORDER BY CHARACTER_SET_NAME, COLLATION_NAME, COL_CML;
COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME COL_CML DATA_TYPE CHARACTER_SET_NAME COLLATION_NAME
NULL bigint NULL NULL NULL bigint NULL NULL
NULL datetime NULL NULL NULL datetime NULL NULL
NULL double NULL NULL NULL decimal NULL NULL
NULL int NULL NULL NULL int NULL NULL
NULL smallint NULL NULL NULL smallint NULL NULL
NULL time NULL NULL NULL time NULL NULL
...@@ -325,9 +325,9 @@ NULL mysql columns_priv Timestamp timestamp NULL NULL NULL NULL timestamp ...@@ -325,9 +325,9 @@ NULL mysql columns_priv Timestamp timestamp NULL NULL NULL NULL timestamp
3.0000 mysql column_stat column_name varchar 64 192 utf8 utf8_bin varchar(64) 3.0000 mysql column_stat column_name varchar 64 192 utf8 utf8_bin varchar(64)
3.0000 mysql column_stat min_value varchar 255 765 utf8 utf8_bin varchar(255) 3.0000 mysql column_stat min_value varchar 255 765 utf8 utf8_bin varchar(255)
3.0000 mysql column_stat max_value varchar 255 765 utf8 utf8_bin varchar(255) 3.0000 mysql column_stat max_value varchar 255 765 utf8 utf8_bin varchar(255)
NULL mysql column_stat nulls_ratio double NULL NULL NULL NULL double NULL mysql column_stat nulls_ratio decimal NULL NULL NULL NULL decimal(12,4)
NULL mysql column_stat avg_length double NULL NULL NULL NULL double NULL mysql column_stat avg_length decimal NULL NULL NULL NULL decimal(12,4)
NULL mysql column_stat avg_frequency double NULL NULL NULL NULL double NULL mysql column_stat avg_frequency decimal NULL NULL NULL NULL decimal(12,4)
3.0000 mysql db Host char 60 180 utf8 utf8_bin char(60) 3.0000 mysql db Host char 60 180 utf8 utf8_bin char(60)
3.0000 mysql db Db char 64 192 utf8 utf8_bin char(64) 3.0000 mysql db Db char 64 192 utf8 utf8_bin char(64)
3.0000 mysql db User char 16 48 utf8 utf8_bin char(16) 3.0000 mysql db User char 16 48 utf8 utf8_bin char(16)
...@@ -420,7 +420,7 @@ NULL mysql help_topic help_category_id smallint NULL NULL NULL NULL smallint(5) ...@@ -420,7 +420,7 @@ NULL mysql help_topic help_category_id smallint NULL NULL NULL NULL smallint(5)
3.0000 mysql index_stat table_name varchar 64 192 utf8 utf8_bin varchar(64) 3.0000 mysql index_stat table_name varchar 64 192 utf8 utf8_bin varchar(64)
3.0000 mysql index_stat index_name varchar 64 192 utf8 utf8_bin varchar(64) 3.0000 mysql index_stat index_name varchar 64 192 utf8 utf8_bin varchar(64)
NULL mysql index_stat prefix_arity int NULL NULL NULL NULL int(11) unsigned NULL mysql index_stat prefix_arity int NULL NULL NULL NULL int(11) unsigned
NULL mysql index_stat avg_frequency double NULL NULL NULL NULL double NULL mysql index_stat avg_frequency decimal NULL NULL NULL NULL decimal(12,4)
NULL mysql ndb_binlog_index Position bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql ndb_binlog_index Position bigint NULL NULL NULL NULL bigint(20) unsigned
1.0000 mysql ndb_binlog_index File varchar 255 255 latin1 latin1_swedish_ci varchar(255) 1.0000 mysql ndb_binlog_index File varchar 255 255 latin1 latin1_swedish_ci varchar(255)
NULL mysql ndb_binlog_index epoch bigint NULL NULL NULL NULL bigint(20) unsigned NULL mysql ndb_binlog_index epoch bigint NULL NULL NULL NULL bigint(20) unsigned
......
mysql-test/t/statistics.test
View file @ cb0a5c84
...@@ -471,14 +471,24 @@ SELECT UPPER(db_name), UPPER(table_name), ...@@ -471,14 +471,24 @@ SELECT UPPER(db_name), UPPER(table_name),
use test; use test;
DROP DATABASE world; DROP DATABASE world;
SELECT * FROM mysql.table_stat; SELECT UPPER(db_name), UPPER(table_name), cardinality
SELECT * FROM mysql.column_stat; FROM mysql.table_stat;
SELECT * FROM mysql.index_stat; SELECT UPPER(db_name), UPPER(table_name),
column_name, min_value, max_value, nulls_ratio, avg_length, avg_frequency
FROM mysql.column_stat;
SELECT UPPER(db_name), UPPER(table_name),
index_name, prefix_arity, avg_frequency
FROM mysql.index_stat;
DROP DATABASE world_innodb; DROP DATABASE world_innodb;
SELECT * FROM mysql.table_stat; SELECT UPPER(db_name), UPPER(table_name), cardinality
SELECT * FROM mysql.column_stat; FROM mysql.table_stat;
SELECT * FROM mysql.index_stat; SELECT UPPER(db_name), UPPER(table_name),
column_name, min_value, max_value, nulls_ratio, avg_length, avg_frequency
FROM mysql.column_stat;
SELECT UPPER(db_name), UPPER(table_name),
index_name, prefix_arity, avg_frequency
FROM mysql.index_stat;
DELETE FROM mysql.table_stat; DELETE FROM mysql.table_stat;
DELETE FROM mysql.column_stat; DELETE FROM mysql.column_stat;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7