diff options
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/fulltext.test | 2 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_embedded.result | 60 | ||||
| -rw-r--r-- | mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result | 60 |
3 files changed, 112 insertions, 10 deletions
diff --git a/mysql-test/suite/innodb_fts/t/fulltext.test b/mysql-test/suite/innodb_fts/t/fulltext.test index 4b73e2ea15b..e94480f37d8 100644 --- a/mysql-test/suite/innodb_fts/t/fulltext.test +++ b/mysql-test/suite/innodb_fts/t/fulltext.test @@ -570,6 +570,8 @@ INSERT INTO t2 VALUES (1,'Scargill'); CREATE TABLE t3 (a int, b int) ENGINE = InnoDB; INSERT INTO t3 VALUES (1,1), (2,1); +SELECT * FROM t2 where MATCH(b2) AGAINST('scargill' IN BOOLEAN MODE); + --echo # t2 should use full text index EXPLAIN SELECT count(*) FROM t1 WHERE diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result index 1826eecf70c..596446251a1 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result @@ -2244,11 +2244,21 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_CACHE_HIT_RATIO VARIABLE_SCOPE SESSION -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Expected hit rate of the row and index cache in storage engines. The value should be an integer between 0 and 99, where 0 means cache is empty and 99 means that value is almost always in the cache. +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Expected hit rate of the row and index cache in storage engines. The value should be an integer between 0 and 100, where 0 means cache is empty and 100 means that value is almost always in the cache NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 99 -NUMERIC_BLOCK_SIZE 1 +NUMERIC_MAX_VALUE 100 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_DISK_READ_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of reading a block of IO_SIZE from an disk (ms 4096 bytes) +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED @@ -2282,6 +2292,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_LOOKUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost modifier for finding a row based on not clustered key +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_KEY_NEXT_FIND_COST VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE @@ -2322,6 +2342,36 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_LOOKUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of fiding a row based on a rowid or a clustered key +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_NEXT_FIND_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next row when scanning the table +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_SCAN_LOOKUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost modifier for reading a block when scanning a table +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2385,7 +2435,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_WHERE_COST VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT Cost of checking the row against the WHERE clause. +VARIABLE_COMMENT Cost of checking the row against the WHERE clause NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 NUMERIC_BLOCK_SIZE NULL diff --git a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result index a5a51309bf8..81fa6413c2f 100644 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result @@ -2404,11 +2404,21 @@ READ_ONLY YES COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_CACHE_HIT_RATIO VARIABLE_SCOPE SESSION -VARIABLE_TYPE INT UNSIGNED -VARIABLE_COMMENT Expected hit rate of the row and index cache in storage engines. The value should be an integer between 0 and 99, where 0 means cache is empty and 99 means that value is almost always in the cache. +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Expected hit rate of the row and index cache in storage engines. The value should be an integer between 0 and 100, where 0 means cache is empty and 100 means that value is almost always in the cache NUMERIC_MIN_VALUE 0 -NUMERIC_MAX_VALUE 99 -NUMERIC_BLOCK_SIZE 1 +NUMERIC_MAX_VALUE 100 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_DISK_READ_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of reading a block of IO_SIZE from an disk (ms 4096 bytes) +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED @@ -2442,6 +2452,16 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_KEY_LOOKUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost modifier for finding a row based on not clustered key +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_KEY_NEXT_FIND_COST VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE @@ -2482,6 +2502,36 @@ NUMERIC_BLOCK_SIZE NULL ENUM_VALUE_LIST NULL READ_ONLY NO COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_LOOKUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of fiding a row based on a rowid or a clustered key +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_ROW_NEXT_FIND_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost of finding the next row when scanning the table +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 1 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED +VARIABLE_NAME OPTIMIZER_SCAN_LOOKUP_COST +VARIABLE_SCOPE SESSION +VARIABLE_TYPE DOUBLE +VARIABLE_COMMENT Cost modifier for reading a block when scanning a table +NUMERIC_MIN_VALUE 0 +NUMERIC_MAX_VALUE 10 +NUMERIC_BLOCK_SIZE NULL +ENUM_VALUE_LIST NULL +READ_ONLY NO +COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_SEARCH_DEPTH VARIABLE_SCOPE SESSION VARIABLE_TYPE BIGINT UNSIGNED @@ -2545,7 +2595,7 @@ COMMAND_LINE_ARGUMENT REQUIRED VARIABLE_NAME OPTIMIZER_WHERE_COST VARIABLE_SCOPE SESSION VARIABLE_TYPE DOUBLE -VARIABLE_COMMENT Cost of checking the row against the WHERE clause. +VARIABLE_COMMENT Cost of checking the row against the WHERE clause NUMERIC_MIN_VALUE 0 NUMERIC_MAX_VALUE 1 NUMERIC_BLOCK_SIZE NULL |