- commits - lists.mariadb.org

[Commits] 1d98333: MDEV-15894 Error, while using aggregated functions/window functions in anchor part
by IgorBabaev 17 Apr '18

17 Apr '18

revision-id: 1d98333ad986d89215f903798a1787ab20308c6b (mariadb-10.2.14-52-g1d98333) parent(s): e34d3184fd02967616bb83904aa3c21977ce6205 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-17 10:35:55 -0700 message: MDEV-15894 Error, while using aggregated functions/window functions in anchor part Usage of aggregate/window functions in non-recursive parts of recursive CTEs is allowed. Error messages complaining about this were reported by mistake. --- mysql-test/r/cte_recursive.result | 19 +++++++++++++++++++ mysql-test/t/cte_recursive.test | 19 +++++++++++++++++++ sql/sql_cte.cc | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index e1a52be..6b2db35 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3179,3 +3179,22 @@ p1 k2 p2 k1 10 10 10 10 DROP PROCEDURE getNums; DROP TABLE t1; +# +# MDEV-15894: aggregate/winfow functions in non-recorsive part +# +create table t1(b int); +insert into t1 values(10),(20),(10); +with recursive qn as +(select max(b) as a from t1 union +select a from qn) +select * from qn; +a +20 +with recursive qn as +(select rank() over (order by b) as a from t1 union +select a from qn) +select * from qn; +a +1 +3 +drop table t1; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index e3032fc..50cb39a 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2190,3 +2190,22 @@ call getNums(); DROP PROCEDURE getNums; DROP TABLE t1; + +--echo # +--echo # MDEV-15894: aggregate/winfow functions in non-recorsive part +--echo # + +create table t1(b int); +insert into t1 values(10),(20),(10); + +with recursive qn as + (select max(b) as a from t1 union + select a from qn) +select * from qn; + +with recursive qn as + (select rank() over (order by b) as a from t1 union + select a from qn) +select * from qn; + +drop table t1; diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc index 6bc833b..cd2516c 100644 --- a/sql/sql_cte.cc +++ b/sql/sql_cte.cc @@ -1173,7 +1173,7 @@ bool st_select_lex::check_unrestricted_recursive(bool only_standard_compliant) /* Check conditions 3-4 for restricted specification*/ - if (with_sum_func || + if ((with_sum_func && !with_elem->is_anchor(this)) || (with_elem->contains_sq_with_recursive_reference())) with_elem->get_owner()->add_unrestricted( with_elem->get_mutually_recursive());

1 0

[Commits] ec3f22d: MDEV-15894 Error, while using aggregated functions/window functions in anchor part
by IgorBabaev 17 Apr '18

17 Apr '18

revision-id: ec3f22d8c86fa0b53b4439551aeca453d7ec54b9 (mariadb-10.2.14-52-gec3f22d) parent(s): e34d3184fd02967616bb83904aa3c21977ce6205 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-17 10:34:04 -0700 message: MDEV-15894 Error, while using aggregated functions/window functions in anchor part Usage of aggregate/window functions in non-recursive parts of recursive CTEs is allowed. Error messages complaining about this was a mistake.. --- mysql-test/r/cte_recursive.result | 19 +++++++++++++++++++ mysql-test/t/cte_recursive.test | 19 +++++++++++++++++++ sql/sql_cte.cc | 2 +- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index e1a52be..6b2db35 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3179,3 +3179,22 @@ p1 k2 p2 k1 10 10 10 10 DROP PROCEDURE getNums; DROP TABLE t1; +# +# MDEV-15894: aggregate/winfow functions in non-recorsive part +# +create table t1(b int); +insert into t1 values(10),(20),(10); +with recursive qn as +(select max(b) as a from t1 union +select a from qn) +select * from qn; +a +20 +with recursive qn as +(select rank() over (order by b) as a from t1 union +select a from qn) +select * from qn; +a +1 +3 +drop table t1; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index e3032fc..50cb39a 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -2190,3 +2190,22 @@ call getNums(); DROP PROCEDURE getNums; DROP TABLE t1; + +--echo # +--echo # MDEV-15894: aggregate/winfow functions in non-recorsive part +--echo # + +create table t1(b int); +insert into t1 values(10),(20),(10); + +with recursive qn as + (select max(b) as a from t1 union + select a from qn) +select * from qn; + +with recursive qn as + (select rank() over (order by b) as a from t1 union + select a from qn) +select * from qn; + +drop table t1; diff --git a/sql/sql_cte.cc b/sql/sql_cte.cc index 6bc833b..cd2516c 100644 --- a/sql/sql_cte.cc +++ b/sql/sql_cte.cc @@ -1173,7 +1173,7 @@ bool st_select_lex::check_unrestricted_recursive(bool only_standard_compliant) /* Check conditions 3-4 for restricted specification*/ - if (with_sum_func || + if ((with_sum_func && !with_elem->is_anchor(this)) || (with_elem->contains_sq_with_recursive_reference())) with_elem->get_owner()->add_unrestricted( with_elem->get_mutually_recursive());

1 0

[Commits] bb5f496: MDEV-13584 Assertion `!part_elem->tablespace_name && !table_create_info->tablespace' failed during EXCHANGE PARTITION with different TABLESPACE.
by holyfoot＠askmonty.org 17 Apr '18

17 Apr '18

revision-id: bb5f4967f54d3f458bec86fb1845405a0a88bc0f (mariadb-10.3.6-14-gbb5f496) parent(s): 02e897ca57168059c6a74d1129158afea93aa875 committer: Alexey Botchkov timestamp: 2018-04-17 16:10:47 +0400 message: MDEV-13584 Assertion `!part_elem->tablespace_name && !table_create_info->tablespace' failed during EXCHANGE PARTITION with different TABLESPACE. Wrong DBUG_ASSERT just removed. --- mysql-test/main/partition_exchange.result | 11 +++++++++++ mysql-test/main/partition_exchange.test | 13 +++++++++++++ sql/sql_partition.cc | 2 -- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/mysql-test/main/partition_exchange.result b/mysql-test/main/partition_exchange.result index 3bce5ae..b27da5b 100644 --- a/mysql-test/main/partition_exchange.result +++ b/mysql-test/main/partition_exchange.result @@ -1297,3 +1297,14 @@ SHOW WARNINGS; Level Code Message UNLOCK TABLES; DROP TABLE t, t2, tp; +# +# Assertion `!part_elem->tablespace_name && !table_create_info->tablespace' +# failed during EXCHANGE PARTITION with different TABLESPACE. +# +CREATE TABLE t1 (a VARCHAR(200)) PARTITION BY KEY(a) partitions 10; +ALTER TABLE t1 ADD PARTITION (PARTITION pm TABLESPACE = `innodb_file_per_table`); +CREATE TABLE t2 like t1; +ALTER TABLE t2 REMOVE PARTITIONING; +ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2; +ERROR HY000: Non matching attribute 'TABLESPACE' between partition and table +DROP TABLE t1, t2; diff --git a/mysql-test/main/partition_exchange.test b/mysql-test/main/partition_exchange.test index 8dc40da..cb33b8d 100644 --- a/mysql-test/main/partition_exchange.test +++ b/mysql-test/main/partition_exchange.test @@ -523,3 +523,16 @@ UNLOCK TABLES; dec $count; } DROP TABLE t, t2, tp; + +--echo # +--echo # Assertion `!part_elem->tablespace_name && !table_create_info->tablespace' +--echo # failed during EXCHANGE PARTITION with different TABLESPACE. +--echo # +CREATE TABLE t1 (a VARCHAR(200)) PARTITION BY KEY(a) partitions 10; +ALTER TABLE t1 ADD PARTITION (PARTITION pm TABLESPACE = `innodb_file_per_table`); +CREATE TABLE t2 like t1; +ALTER TABLE t2 REMOVE PARTITIONING; +--error ER_PARTITION_EXCHANGE_DIFFERENT_OPTION +ALTER TABLE t1 EXCHANGE PARTITION pm WITH TABLE t2; +DROP TABLE t1, t2; + diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 94e90e1..c5c39a2 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -4762,8 +4762,6 @@ bool compare_partition_options(HA_CREATE_INFO *table_create_info, const char *option_diffs[MAX_COMPARE_PARTITION_OPTION_ERRORS + 1]; int i, errors= 0; DBUG_ENTER("compare_partition_options"); - DBUG_ASSERT(!part_elem->tablespace_name && - !table_create_info->tablespace); /* Note that there are not yet any engine supporting tablespace together

1 0

[Commits] 6bea5e9: MyRocks: Post-merge fixes in bulk_load_error.test
by psergey＠askmonty.org 17 Apr '18

17 Apr '18

revision-id: 6bea5e9e0f37499a9ff5f54e2e8f7665ec1ac317 parent(s): a7e5049fec3d938dd19df82c3db047a2a0d9119f committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-17 15:04:15 +0300 message: MyRocks: Post-merge fixes in bulk_load_error.test --- .../mysql-test/rocksdb/r/bulk_load_errors.result | 22 +++++++++++++--------- .../mysql-test/rocksdb/t/bulk_load_errors.test | 9 +++------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result index 86a88c3..3703c20 100644 --- a/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result +++ b/storage/rocksdb/mysql-test/rocksdb/r/bulk_load_errors.result @@ -14,27 +14,30 @@ INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(2); INSERT INTO t1 VALUES(20); INSERT INTO t1 VALUES(21); -# -# In MyRocks, the following statement will intentionally crash the server. -# In MariaDB, it will cause an error SET rocksdb_bulk_load=0; ERROR HY000: Rows inserted during bulk load must not overlap existing rows -# -# Despite the error, bulk load operation is over so the variable value -# will be 0: -select @@rocksdb_bulk_load; -@@rocksdb_bulk_load -0 +SHOW VARIABLES LIKE 'rocksdb_bulk_load'; +Variable_name Value +rocksdb_bulk_load OFF call mtr.add_suppression('finalizing last SST file while setting bulk loading variable'); +SELECT * FROM t1; +pk +10 +11 +FOUND 1 /RocksDB: Error [0-9]+ finalizing last SST file while setting bulk loading variable/ in rocksdb.bulk_load_errors.1.err +connect con1,localhost,root,,; SET rocksdb_bulk_load=1; INSERT INTO t1 VALUES(1); INSERT INTO t1 VALUES(2); INSERT INTO t1 VALUES(20); INSERT INTO t1 VALUES(21); +connection default; +disconnect con1; SELECT * FROM t1; pk 10 11 +FOUND 1 /RocksDB: Error [0-9]+ finalizing last SST file while disconnecting/ in rocksdb.bulk_load_errors.2.err TRUNCATE TABLE t1; SET rocksdb_bulk_load_allow_unsorted=1; SET rocksdb_bulk_load=1; @@ -82,6 +85,7 @@ Warning 1292 Truncated incorrect table_open_cache value: '0' INSERT INTO t1 VALUES(51479+0.333333333,1); DROP TABLE t1; SET @@global.table_open_cache=@orig_table_open_cache; +FOUND 1 /RocksDB: Error [0-9]+ finalizing bulk load while closing handler/ in rocksdb.bulk_load_errors.3.err CREATE TABLE t1 (pk INT, PRIMARY KEY (pk)) ENGINE=ROCKSDB; CREATE TABLE t2 (pk INT, PRIMARY KEY (pk)) ENGINE=ROCKSDB; SET rocksdb_bulk_load=1; diff --git a/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test b/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test index 25b98c5..1e349d0 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test @@ -33,13 +33,10 @@ SET rocksdb_bulk_load=0; SHOW VARIABLES LIKE 'rocksdb_bulk_load'; call mtr.add_suppression('finalizing last SST file while setting bulk loading variable'); ---echo # ---echo # Despite the error, bulk load operation is over so the variable value ---echo # will be 0: SELECT * FROM t1; --let SEARCH_FILE=$LOG1 ---let SEARCH_PATTERN=RocksDB: Error 198 finalizing last SST file while setting bulk loading variable +--let SEARCH_PATTERN=RocksDB: Error [0-9]+ finalizing last SST file while setting bulk loading variable --source include/search_pattern_in_file.inc --let LOG2=$MYSQLTEST_VARDIR/tmp/rocksdb.bulk_load_errors.2.err @@ -64,7 +61,7 @@ SELECT * FROM t1; --source include/wait_until_count_sessions.inc --let SEARCH_FILE=$LOG2 ---let SEARCH_PATTERN=RocksDB: Error 198 finalizing last SST file while disconnecting +--let SEARCH_PATTERN=RocksDB: Error [0-9]+ finalizing last SST file while disconnecting --source include/search_pattern_in_file.inc --let LOG3=$MYSQLTEST_VARDIR/tmp/rocksdb.bulk_load_errors.3.err @@ -121,7 +118,7 @@ DROP TABLE t1; SET @@global.table_open_cache=@orig_table_open_cache; --let SEARCH_FILE=$LOG3 ---let SEARCH_PATTERN=RocksDB: Error 198 finalizing bulk load while closing handler +--let SEARCH_PATTERN=RocksDB: Error [0-9]+ finalizing bulk load while closing handler --source include/search_pattern_in_file.inc --source include/restart_mysqld.inc

1 0

[Commits] b7727a2: vesa patch
by sachin 17 Apr '18

17 Apr '18

revision-id: b7727a2c3398d3ae454fff1165330629521b7d77 (mariadb-10.3.5-158-gb7727a2) parent(s): c9839cb0b34014bb463aa790548a39a1975d9c16 author: Sachin Setiya committer: Sachin Setiya timestamp: 2018-04-17 16:29:46 +0530 message: vesa patch --- CMakeLists.txt | 3 +++ cmake/numa.cmake | 27 ++++++++++++++++++--------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94362c3..52f511e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -129,6 +129,9 @@ IF(DEFINED ENV{CPPFLAGS}) ADD_DEFINITIONS($ENV{CPPFLAGS}) ENDIF() +# NUMA +SET(WITH_NUMA "AUTO" CACHE STRING "Build with non-uniform memory access, allowing --innodb-numa-interleave. Options are ON|OFF|AUTO. ON = enabled (requires NUMA library), OFF = disabled, AUTO = enabled if NUMA library found.") + SET(MYSQL_MAINTAINER_MODE "AUTO" CACHE STRING "MySQL maintainer-specific development environment. Options are: ON OFF AUTO.") # Packaging diff --git a/cmake/numa.cmake b/cmake/numa.cmake index 4bace0e..cdc3122 100644 --- a/cmake/numa.cmake +++ b/cmake/numa.cmake @@ -1,16 +1,18 @@ MACRO (MYSQL_CHECK_NUMA) - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + STRING(TOLOWER "${WITH_NUMA}" WITH_NUMA_LOWERCASE) + + IF(NOT WITH_NUMA) + MESSAGE(STATUS "WITH_NUMA=OFF: NUMA memory allocation policy disabled") + + ELSEIF(NOT WITH_NUMA_LOWERCASE STREQUAL "auto" AND NOT WITH_NUMA_LOWERCASE STREQUAL "on") + MESSAGE(FATAL_ERROR "Wrong value for WITH_NUMA") + + ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux") CHECK_INCLUDE_FILES(numa.h HAVE_NUMA_H) CHECK_INCLUDE_FILES(numaif.h HAVE_NUMAIF_H) IF(HAVE_NUMA_H AND HAVE_NUMAIF_H) - OPTION(WITH_NUMA "Explicitly set NUMA memory allocation policy" ON) - ELSE() - OPTION(WITH_NUMA "Explicitly set NUMA memory allocation policy" OFF) - ENDIF() - - IF(WITH_NUMA AND HAVE_NUMA_H AND HAVE_NUMAIF_H) SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} numa) CHECK_C_SOURCE_COMPILES( @@ -31,12 +33,19 @@ MACRO (MYSQL_CHECK_NUMA) ENDIF() ENDIF() - IF(WITH_NUMA AND NOT HAVE_LIBNUMA) + IF(WITH_NUMA_LOWERCASE STREQUAL "auto" AND HAVE_LIBNUMA) + MESSAGE(STATUS "WITH_NUMA=AUTO: NUMA memory allocation policy enabled") + ELSEIF(WITH_NUMA_LOWERCASE STREQUAL "auto" AND NOT HAVE_LIBNUMA) + MESSAGE(STATUS "WITH_NUMA=AUTO: NUMA memory allocation policy disabled") + ELSEIF(HAVE_LIBNUMA) + MESSAGE(STATUS "WITH_NUMA=ON: NUMA memory allocation policy enabled") + ELSE() # Forget it in cache, abort the build. UNSET(WITH_NUMA CACHE) UNSET(NUMA_LIBRARY CACHE) - MESSAGE(FATAL_ERROR "Could not find numa headers/libraries") + MESSAGE(FATAL_ERROR "WITH_NUMA=ON: Could not find NUMA headers/libraries") ENDIF() + ENDIF() ENDMACRO()

1 0

[Commits] a7e5049: MyRocks: Fix link error on Windows
by psergey＠askmonty.org 17 Apr '18

17 Apr '18

revision-id: a7e5049fec3d938dd19df82c3db047a2a0d9119f parent(s): 959362c0208c545af8047fa690a439c39290e138 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-17 11:10:11 +0300 message: MyRocks: Fix link error on Windows rocksdb_aux_lib.lib(rdb_sst_info.obj) : error LNK2001: unresolved external symbol PSI_server [D:\winx64-packages\build\storage\rocksdb\rocksdb.vcxproj] rocksdb_aux_lib is an utility library used by standalone tools. These won't have PSI_server. FIxed by moving rdb_sst_info.* out of the library (as they do not seem to be used by these standalone tools) --- storage/rocksdb/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt index d5e9b19..953854d 100644 --- a/storage/rocksdb/CMakeLists.txt +++ b/storage/rocksdb/CMakeLists.txt @@ -95,6 +95,8 @@ SET(ROCKSDB_SE_SOURCES rdb_threads.h rdb_psi.h rdb_psi.cc + rdb_sst_info.cc + rdb_sst_info.h ) # MariaDB: the following is added in build_rocksdb.cmake, when appropriate: @@ -137,8 +139,6 @@ ADD_CONVENIENCE_LIBRARY(rocksdb_aux_lib event_listener.h rdb_perf_context.cc rdb_perf_context.h - rdb_sst_info.cc - rdb_sst_info.h rdb_buff.h rdb_mariadb_port.h )

1 0

[Commits] 5e61e17: MDEV-14515 ifnull result depends on number of rows in joined table
by IgorBabaev 16 Apr '18

16 Apr '18

revision-id: 5e61e1716e763315009318081fba5994b8910242 (mariadb-5.5.59-58-g5e61e17) parent(s): 88ac368fea2182447284d6bacff4d93ef1acb865 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-16 16:59:19 -0700 message: MDEV-14515 ifnull result depends on number of rows in joined table Any expensive WHERE condition for a table-less query with implicit aggregation was lost. As a result the used aggregate functions were calculated over a non-empty set of rows even in the case when the condition was false. --- mysql-test/r/subselect4.result | 24 ++++++++++++++++++++++-- mysql-test/t/subselect4.test | 23 +++++++++++++++++++++++ sql/opt_subselect.cc | 1 + 3 files changed, 46 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/subselect4.result b/mysql-test/r/subselect4.result index c20c048..6accc23 100644 --- a/mysql-test/r/subselect4.result +++ b/mysql-test/r/subselect4.result @@ -1056,7 +1056,7 @@ EXPLAIN SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT min(f3)+f3, min(f4)+f3+max(f4) FROM t2 WHERE f3 > 10); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE -2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL No matching min/max row +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT min(f3)+f3, min(f4)+f3+max(f4) FROM t2 WHERE f3 > 10); f1 f2 SET @@optimizer_switch = 'materialization=off,in_to_exists=on,semijoin=off'; @@ -1147,7 +1147,7 @@ EXPLAIN SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT min(f3)+f3, min(f4)+f3+max(f4) FROM t2 WHERE f3 > 10); id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE -2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL No matching min/max row +2 SUBQUERY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables SELECT * FROM t1 WHERE (2, 0) NOT IN (SELECT min(f3)+f3, min(f4)+f3+max(f4) FROM t2 WHERE f3 > 10); f1 f2 set @@optimizer_switch=@save_optimizer_switch; @@ -2511,3 +2511,23 @@ SELECT 2 IN (SELECT 2 from DUAL WHERE 1 != 1); 0 SET optimizer_switch= @@global.optimizer_switch; set @@tmp_table_size= @@global.tmp_table_size; +# +# mfrv-14515: Wrong results for tableless query with subquery in WHERE +# and implicit aggregation +# +create table t1 (i1 int, i2 int); +insert into t1 values (1314, 1084),(1330, 1084),(1401, 1084),(580, 1084); +create table t2 (cd int); +insert into t2 values +(1330), (1330), (1330), (1330), (1330), (1330), (1330), (1330), +(1330), (1330), (1330), (1330), (1330), (1330), (1330), (1330); +select max(10) from dual +where exists (select 1 from t2 join t1 on t1.i1 = t2.cd and t1.i2 = 345); +max(10) +NULL +insert into t2 select * from t2; +select max(10) from dual +where exists (select 1 from t2 join t1 on t1.i1 = t2.cd and t1.i2 = 345); +max(10) +NULL +DROP TABLE t1,t2; diff --git a/mysql-test/t/subselect4.test b/mysql-test/t/subselect4.test index 673dc9b..2b53b55 100644 --- a/mysql-test/t/subselect4.test +++ b/mysql-test/t/subselect4.test @@ -2045,3 +2045,26 @@ SELECT 2 IN (SELECT 2 from DUAL WHERE 1 != 1); SET optimizer_switch= @@global.optimizer_switch; set @@tmp_table_size= @@global.tmp_table_size; + +--echo # +--echo # mfrv-14515: Wrong results for tableless query with subquery in WHERE +--echo # and implicit aggregation +--echo # + +create table t1 (i1 int, i2 int); +insert into t1 values (1314, 1084),(1330, 1084),(1401, 1084),(580, 1084); + +create table t2 (cd int); +insert into t2 values + (1330), (1330), (1330), (1330), (1330), (1330), (1330), (1330), + (1330), (1330), (1330), (1330), (1330), (1330), (1330), (1330); + +select max(10) from dual + where exists (select 1 from t2 join t1 on t1.i1 = t2.cd and t1.i2 = 345); + +insert into t2 select * from t2; + +select max(10) from dual + where exists (select 1 from t2 join t1 on t1.i1 = t2.cd and t1.i2 = 345); + +DROP TABLE t1,t2; diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index c21541c..1bda84b 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -5903,5 +5903,6 @@ bool JOIN::choose_tableless_subquery_plan() tmp_having= having; } } + exec_const_cond= conds; return FALSE; }

1 0

[Commits] 283b327: Changes for MDEV-12387
by galina.shalygina＠mariadb.com 16 Apr '18

16 Apr '18

revision-id: 283b3275742ca22cd1f46a21b1a794f1b52039a9 (mariadb-10.3.4-59-g283b327) parent(s): 608d6773bff86b82d9fa35e77065cb0b6ed9e547 author: Galina Shalygina committer: Galina Shalygina timestamp: 2018-04-17 01:06:57 +0200 message: Changes for MDEV-12387 Procedures renamed, some missing definitions added. *Item_direct_view_ref::in_subq_field_transformer_for_having added --- sql/item.cc | 7 ++-- sql/item.h | 13 ++++--- sql/item_cmpfunc.h | 4 +- sql/opt_subselect.cc | 105 ++++++++++++++++++++++++++++++++++++--------------- sql/sql_derived.cc | 8 ++-- sql/sql_select.cc | 1 + 6 files changed, 92 insertions(+), 46 deletions(-) diff --git a/sql/item.cc b/sql/item.cc index b1134d1..7a6879e 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -7904,8 +7904,7 @@ Grouping_tmp_field *find_matching_grouping_field(Item *item, } -Item *Item_field::derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg) +Item *Item_field::grouping_field_transformer_for_where(THD *thd, uchar *arg) { st_select_lex *sel= (st_select_lex *)arg; Grouping_tmp_field *gr_field= find_matching_grouping_field(this, sel); @@ -7916,8 +7915,8 @@ Item *Item_field::derived_grouping_field_transformer_for_where(THD *thd, Item * -Item_direct_view_ref::derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg) +Item_direct_view_ref::grouping_field_transformer_for_where(THD *thd, + uchar *arg) { if (!item_equal) return this; diff --git a/sql/item.h b/sql/item.h index 2d8972f..faeb4ae 100644 --- a/sql/item.h +++ b/sql/item.h @@ -1785,8 +1785,7 @@ class Item: public Value_source, { return this; } virtual Item *derived_field_transformer_for_where(THD *thd, uchar *arg) { return this; } - virtual Item *derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg) + virtual Item *grouping_field_transformer_for_where(THD *thd, uchar *arg) { return this; } virtual Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg) { return this; } @@ -2959,7 +2958,7 @@ class Item_field :public Item_ident virtual Item *update_value_transformer(THD *thd, uchar *select_arg); Item *derived_field_transformer_for_having(THD *thd, uchar *arg); Item *derived_field_transformer_for_where(THD *thd, uchar *arg); - Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg); + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg); Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg); virtual void print(String *str, enum_query_type query_type); bool excl_dep_on_table(table_map tab_map); @@ -5091,8 +5090,8 @@ class Item_direct_view_ref :public Item_direct_ref bool excl_dep_on_in_subq_left_part(Item_in_subselect *subq_pred); Item *derived_field_transformer_for_having(THD *thd, uchar *arg); Item *derived_field_transformer_for_where(THD *thd, uchar *arg); - Item *derived_grouping_field_transformer_for_where(THD *thd, - uchar *arg); + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg); + Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg); void save_val(Field *to) { @@ -5998,7 +5997,9 @@ class Item_cache: public Item_basic_constant, { return convert_to_basic_const_item(thd); } Item *derived_field_transformer_for_where(THD *thd, uchar *arg) { return convert_to_basic_const_item(thd); } - Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg) + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg) + { return convert_to_basic_const_item(thd); } + Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg) { return convert_to_basic_const_item(thd); } }; diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h index c2d7a4c..f565f3a 100644 --- a/sql/item_cmpfunc.h +++ b/sql/item_cmpfunc.h @@ -1260,7 +1260,9 @@ class Item_func_nullif :public Item_func_case_expression { reset_first_arg_if_needed(); return this; } Item *derived_field_transformer_for_where(THD *thd, uchar *arg) { reset_first_arg_if_needed(); return this; } - Item *derived_grouping_field_transformer_for_where(THD *thd, uchar *arg) + Item *grouping_field_transformer_for_where(THD *thd, uchar *arg) + { reset_first_arg_if_needed(); return this; } + Item *in_subq_field_transformer_for_having(THD *thd, uchar *arg) { reset_first_arg_if_needed(); return this; } }; diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 8f6483e..eac779c 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -5898,7 +5898,6 @@ bool setup_jtbm_semi_joins(JOIN *join, List<TABLE_LIST> *join_list, List_iterator<TABLE_LIST> li(*join_list); THD *thd= join->thd; DBUG_ENTER("setup_jtbm_semi_joins"); - eq_list.empty(); while ((table= li++)) { @@ -6432,14 +6431,39 @@ bool Item_equal::excl_dep_on_in_subq_left_part(Item_in_subselect *subq_pred) } -Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) +/** + @brief + Transforms item so it can be pushed into the IN subquery HAVING clause + + @param thd the thread handle + @param in_item the item for which pushable item should be created + @param subq_pred the IN subquery predicate + + @details + This method traverses the fields of the select of the IN subquery predicate + subq_pred trying to find the corresponding item 'new_item' for in_item. + If in_item has equal items it traverses the fields of the select of + subq_pred for each equal item trying to find corresponding item 'new_item'. + If 'new_item' is found, a shell for this item is created. This shell can be + pushed into the HAVING part of subq_pred select. + + @retval <item*> reference to the created corresonding item shell for in_item + @retval NULL if mistake occurs +*/ + +static +Item *get_corresponding_item_for_in_subq_having(THD *thd, Item *in_item, + Item_in_subselect *subq_pred) { - Item_in_subselect *subq_pred= (Item_in_subselect *)arg; + DBUG_ASSERT(in_item->type() == Item::FIELD_ITEM || + (in_item->type() == Item::REF_ITEM && + ((Item_ref *) in_item)->ref_type() == Item_ref::VIEW_REF)); - List_iterator<In_subq_field> li(subq_pred->comparable_fields); In_subq_field *fi; - Item_field *field_item= (Item_field *) (real_item()); Item *new_item; + List_iterator<In_subq_field> li(subq_pred->comparable_fields); + Item_field *field_item= (Item_field *) (in_item->real_item()); + Item_equal *item_equal= in_item->get_item_equal(); if (item_equal) { @@ -6452,10 +6476,11 @@ Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) while ((fi= li++)) { if (field_item->field == - ((Item_field *) (fi->left_it->real_item()))->field) - { - new_item= fi->right_it; - } + ((Item_field *) (fi->left_it->real_item()))->field) + { + new_item= fi->right_it; + break; + } } } } @@ -6465,39 +6490,56 @@ Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) while ((fi= li++)) { if (field_item->field == - ((Item_field *) (fi->left_it->real_item()))->field) + ((Item_field *) (fi->left_it->real_item()))->field) + { new_item= fi->right_it; + break; + } } } - if (!new_item) - return this; - - Item_ref *ref= - new (thd->mem_root) Item_ref(thd, - &subq_pred->unit->first_select()->context, - NullS, NullS, - &new_item->name); + if (new_item) + { + Item_ref *ref= + new (thd->mem_root) Item_ref(thd, + &subq_pred->unit->first_select()->context, + NullS, NullS, + &new_item->name); return ref; - + } DBUG_ASSERT(0); return NULL; } +Item *Item_field::in_subq_field_transformer_for_having(THD *thd, uchar *arg) +{ + return get_corresponding_item_for_in_subq_having(thd, this, + (Item_in_subselect *)arg); +} + + +Item *Item_direct_view_ref::in_subq_field_transformer_for_having(THD *thd, + uchar *arg) +{ + return get_corresponding_item_for_in_subq_having(thd, this, + (Item_in_subselect *)arg); +} + + /** @brief Find fields that are used in the GROUP BY of the select @param thd the thread handle - @param sel select of the right part of IN subquery - @param fields fields list of the left part of IN subquery + @param sel the select of the IN subquery predicate select + @param fields fields of the left part of the IN subquery predicate @details - This method looks through the fields which are used in the GROUP BY of - sel and saves this fields with their prototypes from the fields list - of the left part of IN subquery + This method traverses fields which are used in the GROUP BY of + sel and saves them with their corresponding items from fields. */ + void grouping_fields_in_the_in_subq_left_part(THD *thd, st_select_lex *sel, List<In_subq_field> *fields, @@ -6568,6 +6610,7 @@ void grouping_fields_in_the_in_subq_left_part(THD *thd, @retval TRUE if an error occurs @retval FALSE otherwise */ + bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) { DBUG_ENTER("Item_in_subselect::pushdown_cond_for_in_subquery"); @@ -6640,12 +6683,12 @@ bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) if (cond_over_partition_fields) cond_over_partition_fields= cond_over_partition_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, (uchar*) sel); + &Item::grouping_field_transformer_for_where, (uchar*) sel); if (cond_over_partition_fields) { cond_over_partition_fields->walk( - &Item::cleanup_excluding_const_fields_processor, 0, 0); + &Item::cleanup_excluding_const_fields_processor, 0, 0); sel->cond_pushed_into_where= cond_over_partition_fields; } goto exit; @@ -6667,9 +6710,10 @@ bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) into the sel of the WHERE clause. */ if (cond_over_grouping_fields) - cond_over_grouping_fields= cond_over_grouping_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, - (uchar*) sel); + cond_over_grouping_fields= + cond_over_grouping_fields->transform(thd, + &Item::grouping_field_transformer_for_where, + (uchar*) sel); if (cond_over_grouping_fields) { @@ -6695,8 +6739,7 @@ bool Item_in_subselect::pushdown_cond_for_in_subquery(THD *thd, Item *cond) if (!extracted_cond) goto exit; - extracted_cond->walk(&Item::cleanup_excluding_const_fields_processor, - 0, 0); + extracted_cond->walk(&Item::cleanup_excluding_const_fields_processor, 0, 0); sel->cond_pushed_into_having= extracted_cond; exit: diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index f2179ae..1c62a38 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -1310,8 +1310,8 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived) sl->build_cond_for_grouping_fields(thd, extracted_cond_copy, true); if (cond_over_partition_fields) cond_over_partition_fields= cond_over_partition_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, - (uchar*) sl); + &Item::grouping_field_transformer_for_where, + (uchar*) sl); if (cond_over_partition_fields) { cond_over_partition_fields->walk( @@ -1364,8 +1364,8 @@ bool pushdown_cond_for_derived(THD *thd, Item *cond, TABLE_LIST *derived) */ if (cond_over_grouping_fields) cond_over_grouping_fields= cond_over_grouping_fields->transform(thd, - &Item::derived_grouping_field_transformer_for_where, - (uchar*) sl); + &Item::grouping_field_transformer_for_where, + (uchar*) sl); if (cond_over_grouping_fields) { diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 5a342c8..e7bc68e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -1750,6 +1750,7 @@ JOIN::optimize_inner() conds->fix_fields(thd, &conds))) DBUG_RETURN(TRUE); } + eq_list.empty(); if (select_lex->cond_pushed_into_where) {

1 0

[Commits] 1a8c82161aa: MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)->thread)' failed in _ma_state_info_write
by Oleksandr Byelkin 16 Apr '18

16 Apr '18

revision-id: 1a8c82161aa2924c2bf368d376b967212f0d824f (mariadb-10.3.5-144-g1a8c82161aa) parent(s): 65eefcdc601ef0f57b0779f1722161fc83a571c3 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-04-17 00:13:07 +0200 message: MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)->thread)' failed in _ma_state_info_write Length of numegic function results limited by matsimum really possible length. (Problem was that negation did not limited it and then was not possible to create so long field) --- mysql-test/main/cast.result | 2 +- mysql-test/main/ctype_binary.result | 12 +- mysql-test/main/ctype_cp1251.result | 12 +- mysql-test/main/ctype_latin1.result | 12 +- mysql-test/main/ctype_ucs.result | 12 +- mysql-test/main/ctype_utf8.result | 12 +- mysql-test/main/metadata.result | 12 +- mysql-test/main/union.result | 502 +++++++++++++++++++++ mysql-test/main/union.test | 260 +++++++++++ .../suite/rpl/r/rpl_row_create_select.result | 4 +- sql/item.h | 5 + sql/item_func.cc | 13 + sql/item_func.h | 10 +- 13 files changed, 828 insertions(+), 40 deletions(-) diff --git a/mysql-test/main/cast.result b/mysql-test/main/cast.result index ca314573581..72e5608ca40 100644 --- a/mysql-test/main/cast.result +++ b/mysql-test/main/cast.result @@ -761,7 +761,7 @@ Warning 1292 Truncated incorrect INTEGER value: '9999999999999999999999999999999 SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `CONCAT(CAST(REPEAT('9', 1000) AS SIGNED))` varchar(21) NOT NULL, + `CONCAT(CAST(REPEAT('9', 1000) AS SIGNED))` varchar(20) NOT NULL, `CONCAT(CAST(REPEAT('9', 1000) AS UNSIGNED))` varchar(20) NOT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 DROP TABLE t1; diff --git a/mysql-test/main/ctype_binary.result b/mysql-test/main/ctype_binary.result index 0afe5298411..a2a24873399 100644 --- a/mysql-test/main/ctype_binary.result +++ b/mysql-test/main/ctype_binary.result @@ -132,7 +132,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -142,7 +142,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -162,7 +162,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -172,7 +172,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -182,7 +182,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -192,7 +192,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varbinary(21) DEFAULT NULL + `c1` varbinary(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_cp1251.result b/mysql-test/main/ctype_cp1251.result index 2da53740619..f86facdf01b 100644 --- a/mysql-test/main/ctype_cp1251.result +++ b/mysql-test/main/ctype_cp1251.result @@ -541,7 +541,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -551,7 +551,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -571,7 +571,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -581,7 +581,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -591,7 +591,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -601,7 +601,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET cp1251 DEFAULT NULL + `c1` varchar(20) CHARACTER SET cp1251 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_latin1.result b/mysql-test/main/ctype_latin1.result index d5906cb74dd..97761e6ceec 100644 --- a/mysql-test/main/ctype_latin1.result +++ b/mysql-test/main/ctype_latin1.result @@ -838,7 +838,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -848,7 +848,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -868,7 +868,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -878,7 +878,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -888,7 +888,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -898,7 +898,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) DEFAULT NULL + `c1` varchar(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_ucs.result b/mysql-test/main/ctype_ucs.result index fcc8f27010c..98038ba175d 100644 --- a/mysql-test/main/ctype_ucs.result +++ b/mysql-test/main/ctype_ucs.result @@ -1717,7 +1717,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -1727,7 +1727,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -1747,7 +1747,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -1757,7 +1757,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -1767,7 +1767,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -1777,7 +1777,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET ucs2 DEFAULT NULL + `c1` varchar(20) CHARACTER SET ucs2 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/ctype_utf8.result b/mysql-test/main/ctype_utf8.result index 10d0efeff3c..8f31e7b04be 100644 --- a/mysql-test/main/ctype_utf8.result +++ b/mysql-test/main/ctype_utf8.result @@ -2589,7 +2589,7 @@ create table t1 as select concat(1|2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(1&2)); @@ -2599,7 +2599,7 @@ create table t1 as select concat(1&2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(bit_count(12))); @@ -2619,7 +2619,7 @@ create table t1 as select concat(2<<1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(2>>1)); @@ -2629,7 +2629,7 @@ create table t1 as select concat(2>>1) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(~0)); @@ -2639,7 +2639,7 @@ create table t1 as select concat(~0) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(3^2)); @@ -2649,7 +2649,7 @@ create table t1 as select concat(3^2) as c1; show create table t1; Table Create Table t1 CREATE TABLE `t1` ( - `c1` varchar(21) CHARACTER SET utf8 DEFAULT NULL + `c1` varchar(20) CHARACTER SET utf8 DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t1; select hex(concat(abs(-2))); diff --git a/mysql-test/main/metadata.result b/mysql-test/main/metadata.result index 7848390b62e..df71496f823 100644 --- a/mysql-test/main/metadata.result +++ b/mysql-test/main/metadata.result @@ -512,12 +512,12 @@ BIT_LENGTH(10) 16 SELECT 1|2, 1&2, 1<<2, 1>>2, ~0, 1^2; Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr -def 1|2 8 21 1 N 32929 0 63 -def 1&2 8 21 1 N 32929 0 63 -def 1<<2 8 21 1 N 32929 0 63 -def 1>>2 8 21 1 N 32929 0 63 -def ~0 8 21 20 N 32929 0 63 -def 1^2 8 21 1 N 32929 0 63 +def 1|2 8 20 1 N 32929 0 63 +def 1&2 8 20 1 N 32929 0 63 +def 1<<2 8 20 1 N 32929 0 63 +def 1>>2 8 20 1 N 32929 0 63 +def ~0 8 20 20 N 32929 0 63 +def 1^2 8 20 1 N 32929 0 63 1|2 1&2 1<<2 1>>2 ~0 1^2 3 0 4 0 18446744073709551615 3 SELECT LAST_INSERT_ID(); diff --git a/mysql-test/main/union.result b/mysql-test/main/union.result index 4e5f9312e03..62674f3b217 100644 --- a/mysql-test/main/union.result +++ b/mysql-test/main/union.result @@ -2500,5 +2500,507 @@ t2 CREATE TABLE `t2` ( DROP TABLE t2; DROP TABLE t1; # +# MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 +# && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)-> +# thread)' failed in _ma_state_info_write +# +CREATE TABLE t1 (c1 CHAR(1)); +CREATE TABLE t2 (c2 CHAR, d2 decimal(30,10), i2 bigint); +SET @a= CAST('10' AS CHAR); +CREATE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT - @a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(53) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +CREATE OR REPLACE TABLE t3 AS SELECT d2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `d2` double DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +CREATE OR REPLACE TABLE t3 AS SELECT i2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `i2` double DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT - @a FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def - @a 5 53 0 Y 32896 31 63 +- @a +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT abs(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT abs(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def abs(@a) 5 23 0 Y 32896 31 63 +abs(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a+1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a+1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a+1 5 23 0 Y 32896 31 63 +@a+1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a-1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a-1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a-1 5 23 0 Y 32896 31 63 +@a-1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a*1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a*1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a*1 5 23 0 Y 32896 31 63 +@a*1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a/1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a/1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a/1 5 23 0 Y 32896 31 63 +@a/1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT 1/@a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT 1/@a FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def 1/@a 5 23 0 Y 32896 31 63 +1/@a +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT mod(@a,25) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT mod(@a,25) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def mod(@a,25) 5 23 0 Y 32896 31 63 +mod(@a,25) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as signed) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as signed) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as signed) 8 20 0 Y 32896 0 63 +cast(@a as signed) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as unsigned) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as unsigned) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as unsigned) 8 20 0 Y 32928 0 63 +cast(@a as unsigned) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as double) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(22) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as double) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as double) 5 22 0 Y 32896 31 63 +cast(@a as double) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as decimal) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cast(@a as decimal) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cast(@a as decimal) 246 11 0 Y 32896 0 63 +cast(@a as decimal) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a DIV 1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a DIV 1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a DIV 1 8 20 0 Y 32896 0 63 +@a DIV 1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT exp(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT exp(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def exp(@a) 5 23 0 Y 32896 31 63 +exp(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ln(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ln(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ln(@a) 5 23 0 Y 32896 31 63 +ln(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log2(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT log2(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def log2(@a) 5 23 0 Y 32896 31 63 +log2(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log10(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT log10(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def log10(@a) 5 23 0 Y 32896 31 63 +log10(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT log(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def log(@a) 5 23 0 Y 32896 31 63 +log(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sqrt(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT sqrt(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def sqrt(@a) 5 23 0 Y 32896 31 63 +sqrt(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT pow((a)a,3.5) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT pow((a)a,3.5) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def pow((a)a,3.5) 5 23 0 Y 32896 31 63 +pow((a)a,3.5) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT acos(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT acos(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def acos(@a) 5 23 0 Y 32896 31 63 +acos(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT asin(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT asin(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def asin(@a) 5 23 0 Y 32896 31 63 +asin(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT atan(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT atan(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def atan(@a) 5 23 0 Y 32896 31 63 +atan(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cos(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cos(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cos(@a) 5 23 0 Y 32896 31 63 +cos(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sin(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT sin(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def sin(@a) 5 23 0 Y 32896 31 63 +sin(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT tan(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT tan(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def tan(@a) 5 23 0 Y 32896 31 63 +tan(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cot(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT cot(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def cot(@a) 5 23 0 Y 32896 31 63 +cot(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ceiling(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(17) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ceiling(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ceiling(@a) 5 17 0 Y 32896 0 63 +ceiling(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT floor(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(17) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT floor(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def floor(@a) 5 17 0 Y 32896 0 63 +floor(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT round(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(19) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT round(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def round(@a,2) 5 19 0 Y 32896 2 63 +round(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT rand(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT rand(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def rand(@a) 5 23 0 Y 32896 31 63 +rand(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sign(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT sign(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def sign(@a) 3 2 0 Y 32896 0 63 +sign(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT degrees(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT degrees(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def degrees(@a) 5 23 0 Y 32896 31 63 +degrees(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT least(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT least(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def least(@a,2) 5 23 0 Y 32896 31 63 +least(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT greatest(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(23) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT greatest(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def greatest(@a,2) 5 23 0 Y 32896 31 63 +greatest(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT octet_length(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT octet_length(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def octet_length(@a) 3 10 0 Y 32896 0 63 +octet_length(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_length(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(11) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT bit_length(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def bit_length(@a) 8 11 0 Y 32896 0 63 +bit_length(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT char_length(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT char_length(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def char_length(@a) 3 10 0 Y 32896 0 63 +char_length(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT coercibility(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(10) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT coercibility(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def coercibility(@a) 3 10 0 N 32897 0 63 +coercibility(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ord(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(7) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ord(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ord(@a) 3 7 0 Y 32896 0 63 +ord(@a) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT find_in_set(@a,2) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(3) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT find_in_set(@a,2) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def find_in_set(@a,2) 3 3 0 Y 32896 0 63 +find_in_set(@a,2) +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a|1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a|1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a|1 8 20 0 Y 32928 0 63 +@a|1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a&1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a&1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a&1 8 20 0 Y 32928 0 63 +@a&1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a^1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a^1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a^1 8 20 0 Y 32928 0 63 +@a^1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a>>1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a>>1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a>>1 8 20 0 Y 32928 0 63 +@a>>1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a<<1 FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT @a<<1 FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def @a<<1 8 20 0 Y 32928 0 63 +@a<<1 +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ~@a FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(20) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT ~@a FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def ~@a 8 20 0 Y 32928 0 63 +~@a +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_count(@a) FROM t2; +show create table t3; +Table Create Table +t3 CREATE TABLE `t3` ( + `c1` char(2) DEFAULT NULL +) ENGINE=MyISAM DEFAULT CHARSET=latin1 +SELECT bit_count(@a) FROM t2; +Catalog Database Table Table_alias Column Column_alias Type Length Max length Is_null Flags Decimals Charsetnr +def bit_count(@a) 3 2 0 Y 32896 0 63 +bit_count(@a) +drop table t2,t1; +drop table t3; +# # End of 10.3 tests # diff --git a/mysql-test/main/union.test b/mysql-test/main/union.test index f86cae87524..532b6c02f6d 100644 --- a/mysql-test/main/union.test +++ b/mysql-test/main/union.test @@ -1746,6 +1746,266 @@ DROP TABLE t2; DROP TABLE t1; +--echo # +--echo # MDEV-13232: Assertion `(&(&share->intern_lock)->m_mutex)->count > 0 +--echo # && pthread_equal(pthread_self(), (&(&share->intern_lock)->m_mutex)-> +--echo # thread)' failed in _ma_state_info_write +--echo # + +CREATE TABLE t1 (c1 CHAR(1)); + +CREATE TABLE t2 (c2 CHAR, d2 decimal(30,10), i2 bigint); +SET @a= CAST('10' AS CHAR); + +CREATE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT - @a FROM t2; +show create table t3; +CREATE OR REPLACE TABLE t3 AS SELECT d2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +CREATE OR REPLACE TABLE t3 AS SELECT i2 FROM t2 UNION SELECT - @a FROM t2; +show create table t3; +--enable_metadata +SELECT - @a FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT abs(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT abs(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a+1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a+1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a-1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a-1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a*1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a*1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a/1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a/1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT 1/@a FROM t2; +show create table t3; +--enable_metadata +SELECT 1/@a FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT mod(@a,25) FROM t2; +show create table t3; +--enable_metadata +SELECT mod(@a,25) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as signed) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as signed) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as unsigned) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as unsigned) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as double) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as double) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cast(@a as decimal) FROM t2; +show create table t3; +--enable_metadata +SELECT cast(@a as decimal) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a DIV 1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a DIV 1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT exp(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT exp(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ln(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT ln(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log2(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT log2(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log10(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT log10(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT log(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT log(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sqrt(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT sqrt(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT pow((a)a,3.5) FROM t2; +show create table t3; +--enable_metadata +SELECT pow((a)a,3.5) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT acos(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT acos(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT asin(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT asin(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT atan(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT atan(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cos(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT cos(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sin(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT sin(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT tan(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT tan(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT cot(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT cot(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ceiling(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT ceiling(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT floor(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT floor(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT round(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT round(@a,2) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT rand(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT rand(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT sign(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT sign(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT degrees(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT degrees(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT least(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT least(@a,2) FROM t2; +--disable_metadata +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT greatest(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT greatest(@a,2) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT octet_length(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT octet_length(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_length(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT bit_length(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT char_length(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT char_length(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT coercibility(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT coercibility(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ord(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT ord(@a) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT find_in_set(@a,2) FROM t2; +show create table t3; +--enable_metadata +SELECT find_in_set(@a,2) FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a|1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a|1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a&1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a&1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a^1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a^1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a>>1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a>>1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT @a<<1 FROM t2; +show create table t3; +--enable_metadata +SELECT @a<<1 FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT ~@a FROM t2; +show create table t3; +--enable_metadata +SELECT ~@a FROM t2; +--disable_metadata +CREATE OR REPLACE TABLE t3 AS SELECT c1 FROM t1 UNION SELECT bit_count(@a) FROM t2; +show create table t3; +--enable_metadata +SELECT bit_count(@a) FROM t2; +--disable_metadata + +drop table t2,t1; +drop table t3; + --echo # --echo # End of 10.3 tests --echo # diff --git a/mysql-test/suite/rpl/r/rpl_row_create_select.result b/mysql-test/suite/rpl/r/rpl_row_create_select.result index b064d42982f..694b0c2e342 100644 --- a/mysql-test/suite/rpl/r/rpl_row_create_select.result +++ b/mysql-test/suite/rpl/r/rpl_row_create_select.result @@ -14,7 +14,7 @@ Warning 1292 Truncated incorrect DECIMAL value: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( - `a` bigint(21) DEFAULT NULL + `a` bigint(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 SET STATEMENT sql_mode = 'NO_ENGINE_SUBSTITUTION' FOR CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a; @@ -23,7 +23,7 @@ Warning 1292 Truncated incorrect DECIMAL value: 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA SHOW CREATE TABLE t2; Table Create Table t2 CREATE TABLE `t2` ( - `a` bigint(21) DEFAULT NULL + `a` bigint(20) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 #After the patch, no error is reported. connection slave; diff --git a/sql/item.h b/sql/item.h index 9574bdc63bf..81d2a198495 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2023,6 +2023,11 @@ class Item: public Value_source, { marker &= ~EXTRACTION_MASK; } + void fix_length_according_to_type_handler() + { + uint32 mlen= type_handler()->max_display_length(this); + set_if_smaller(max_length, mlen); + } }; MEM_ROOT *get_thd_memroot(THD *thd); diff --git a/sql/item_func.cc b/sql/item_func.cc index e2740272385..8b09040ccf5 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -802,6 +802,7 @@ void Item_func_plus::fix_length_and_dec(void) Item_func_plus::type_handler()->Item_func_plus_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -1328,6 +1329,7 @@ void Item_func_minus::fix_length_and_dec() Item_func_minus::type_handler()->Item_func_minus_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + fix_length_according_to_type_handler(); DBUG_VOID_RETURN; } @@ -1560,6 +1562,7 @@ void Item_func_mul::fix_length_and_dec(void) Item_func_mul::type_handler()->Item_func_mul_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -1670,6 +1673,7 @@ void Item_func_div::fix_length_and_dec(void) Item_func_div::type_handler()->Item_func_div_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -1757,6 +1761,7 @@ void Item_func_int_div::fix_length_and_dec() MY_INT64_NUM_DECIMAL_DIGITS : char_length); maybe_null=1; unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag; + fix_length_according_to_type_handler(); } @@ -1854,6 +1859,7 @@ void Item_func_mod::fix_length_and_dec() DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); } DBUG_VOID_RETURN; + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } @@ -1954,6 +1960,9 @@ void Item_func_neg::fix_length_and_dec() DBUG_PRINT("info", ("name %s", func_name())); args[0]->cast_to_int_type_handler()->Item_func_neg_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); + + // limit length with some realistic figures for double + fix_length_according_to_type_handler(); DBUG_VOID_RETURN; } @@ -2026,6 +2035,7 @@ void Item_func_abs::fix_length_and_dec() DBUG_PRINT("info", ("name %s", func_name())); args[0]->cast_to_int_type_handler()->Item_func_abs_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); + fix_length_according_to_type_handler(); DBUG_VOID_RETURN; } @@ -2299,6 +2309,7 @@ void Item_func_int_val::fix_length_and_dec() args[0]->cast_to_int_type_handler()-> Item_func_int_val_fix_length_and_dec(this); DBUG_PRINT("info", ("Type: %s", type_handler()->name().ptr())); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); DBUG_VOID_RETURN; } @@ -3044,6 +3055,7 @@ void Item_func_field::fix_length_and_dec() cmp_type= item_cmp_type(cmp_type, args[i]->result_type()); if (cmp_type == STRING_RESULT) agg_arg_charsets_for_comparison(cmp_collation, args, arg_count); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } @@ -3113,6 +3125,7 @@ void Item_func_find_in_set::fix_length_and_dec() } } agg_arg_charsets_for_comparison(cmp_collation, args, 2); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } static const char separator=','; diff --git a/sql/item_func.h b/sql/item_func.h index 74e469ea9f3..ce1e7a3959c 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -734,6 +734,7 @@ class Item_num_op :public Item_func_numhybrid result_precision(); decimals= 0; set_handler(type_handler_long_or_longlong()); + fix_length_according_to_type_handler(); } void fix_length_and_dec_temporal() { @@ -911,6 +912,7 @@ class Item_func_signed :public Item_int_func void fix_length_and_dec() { args[0]->type_handler()->Item_func_signed_fix_length_and_dec(this); + fix_length_according_to_type_handler(); } virtual void print(String *str, enum_query_type query_type); uint decimal_precision() const { return args[0]->decimal_precision(); } @@ -943,6 +945,7 @@ class Item_func_unsigned :public Item_func_signed void fix_length_and_dec() { args[0]->type_handler()->Item_func_unsigned_fix_length_and_dec(this); + fix_length_according_to_type_handler(); } uint decimal_precision() const { return max_length; } virtual void print(String *str, enum_query_type query_type); @@ -974,6 +977,7 @@ class Item_decimal_typecast :public Item_func void fix_length_and_dec() { args[0]->type_handler()->Item_decimal_typecast_fix_length_and_dec(this); + DBUG_ASSERT(max_length <= type_handler()->max_display_length(this)); } const char *func_name() const { return "decimal_typecast"; } virtual void print(String *str, enum_query_type query_type); @@ -1803,7 +1807,11 @@ class Item_func_bit: public Item_longlong_func public: Item_func_bit(THD *thd, Item *a, Item *b): Item_longlong_func(thd, a, b) {} Item_func_bit(THD *thd, Item *a): Item_longlong_func(thd, a) {} - void fix_length_and_dec() { unsigned_flag= 1; } + void fix_length_and_dec() + { + unsigned_flag= 1; + fix_length_according_to_type_handler(); + } virtual inline void print(String *str, enum_query_type query_type) {

1 0

[Commits] 959362c: Fix compilation on windows
by psergey＠askmonty.org 16 Apr '18

16 Apr '18

revision-id: 959362c0208c545af8047fa690a439c39290e138 parent(s): 40bed2d39e0409d3a1ff468f792ec00ae0c8e7df committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-16 21:09:14 +0300 message: Fix compilation on windows --- sql/mysqld.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/mysqld.h b/sql/mysqld.h index 912fe36..a2a97d0 100644 --- a/sql/mysqld.h +++ b/sql/mysqld.h @@ -209,7 +209,7 @@ extern int max_user_connections; extern volatile ulong cached_thread_count; extern ulong what_to_log,flush_time; extern ulong max_prepared_stmt_count, prepared_stmt_count; -extern ulong open_files_limit; +extern MYSQL_PLUGIN_IMPORT ulong open_files_limit; extern ulonglong binlog_cache_size, binlog_stmt_cache_size; extern ulonglong max_binlog_cache_size, max_binlog_stmt_cache_size; extern ulong max_binlog_size;

1 0