- commits - lists.mariadb.org

[Commits] d9415d74fa9: Fix embedded compilation.
by jan 02 Nov '18

02 Nov '18

revision-id: d9415d74fa9de87c50a9565521d923432f0d82b2 (mariadb-10.3.6-183-gd9415d74fa9) parent(s): 4866bd24e1a02530eddeea3a733970259d646a86 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-02 16:10:45 +0200 message: Fix embedded compilation. --- sql/sql_alter.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 958fc2c9566..b1dc1325870 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -476,6 +476,7 @@ bool Sql_cmd_alter_table::execute(THD *thd) thd->work_part_info= 0; #endif +#ifdef WITH_WSREP if (WSREP(thd) && (!thd->is_current_stmt_binlog_format_row() || !thd->find_temporary_table(first_table))) @@ -487,6 +488,7 @@ bool Sql_cmd_alter_table::execute(THD *thd) thd->variables.auto_increment_offset = 1; thd->variables.auto_increment_increment = 1; } +#endif result= mysql_alter_table(thd, &select_lex->db, &lex->name, &create_info,

1 0

[Commits] 73c07803cb2: Add wsrep-lib to source distribution.
by jan 01 Nov '18

01 Nov '18

revision-id: 73c07803cb21f6818c675264faf705b53a2a1fc8 (mariadb-10.3.6-180-g73c07803cb2) parent(s): a72d32f18de7f236a50dd6c63b538d6bae743cac author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-01 12:07:29 +0200 message: Add wsrep-lib to source distribution. --- cmake/make_dist.cmake.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmake/make_dist.cmake.in b/cmake/make_dist.cmake.in index 6fad17137fd..8e77b700eb7 100644 --- a/cmake/make_dist.cmake.in +++ b/cmake/make_dist.cmake.in @@ -50,6 +50,14 @@ IF(GIT_EXECUTABLE) IF(NOT RESULT EQUAL 0) SET(GIT_EXECUTABLE) ENDIF() + EXECUTE_PROCESS( + COMMAND "${GIT_EXECUTABLE}" submodule foreach "${GIT_EXECUTABLE} checkout-index --all --prefix=${PACKAGE_DIR}/wsrep-lib/$path/" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/wsrep-lib + RESULT_VARIABLE RESULT + ) + IF(NOT RESULT EQUAL 0) + SET(GIT_EXECUTABLE) + ENDIF() ENDIF() CONFIGURE_FILE(${CMAKE_BINARY_DIR}/include/source_revision.h

1 0

[Commits] b9a69f776d3: Fix wsrep.cnf installation.
by jan 01 Nov '18

01 Nov '18

revision-id: b9a69f776d3dea825bc23759660258c28bf58cc7 (mariadb-galera-10.0.36-6-gb9a69f776d3) parent(s): e16d91b889c3307ff1512d20221082e78cc8fcc0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-01 10:49:53 +0200 message: Fix wsrep.cnf installation. --- support-files/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index c6ce2c04eb3..e51a78038ac 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -50,6 +50,13 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) ENDFOREACH() ENDIF() +IF(WITH_WSREP) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh + ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} + DESTINATION ${inst_location} COMPONENT IniFiles) +ENDIF() + IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) @@ -102,8 +109,6 @@ IF(UNIX) DESTINATION ${inst_location} COMPONENT SupportFiles PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/wsrep.cnf @ONLY) IF (INSTALL_SYSCONFDIR) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d

1 0

[Commits] fe0809f6f3e: MDEV-17518: Range optimization doesn't use ON expressions from nested outer joins
by Sergei Petrunia 01 Nov '18

01 Nov '18

revision-id: fe0809f6f3e8f78bc4f823195fd8fbd5b66fa324 (mariadb-10.3.10-39-gfe0809f6f3e) parent(s): 63bcbd9ef7d15bbe1422f82b65e29e57308f6f57 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2018-11-01 11:35:28 +0300 message: MDEV-17518: Range optimization doesn't use ON expressions from nested outer joins Part#2: take into account that join nest that we are marking as constant might already have constant tables in it. Don't count these tables twice. --- mysql-test/main/join_outer.result | 15 +++++++++++++++ mysql-test/main/join_outer.test | 17 +++++++++++++++++ mysql-test/main/join_outer_jcl6.result | 15 +++++++++++++++ sql/sql_select.cc | 19 +++++++++++-------- 4 files changed, 58 insertions(+), 8 deletions(-) diff --git a/mysql-test/main/join_outer.result b/mysql-test/main/join_outer.result index aa9f30885a9..6b671a0759f 100644 --- a/mysql-test/main/join_outer.result +++ b/mysql-test/main/join_outer.result @@ -2564,4 +2564,19 @@ drop table t1,t2,t3; set optimizer_use_condition_selectivity= @tmp1; set use_stat_tables= @tmp2; set histogram_size= @tmp3; +# Another test +CREATE TABLE t1 (i1 int) ; +CREATE TABLE t2 (pk int NOT NULL PRIMARY KEY) ; +CREATE TABLE t3 (pk int NOT NULL, i1 int, PRIMARY KEY (pk)) ; +INSERT INTO t3 VALUES (2, NULL); +CREATE TABLE t4 (pk int NOT NULL, i1 int, PRIMARY KEY (pk), KEY i1 (i1)) ; +CREATE VIEW v4 AS SELECT * FROM t4; +SELECT 1 +FROM t3 RIGHT JOIN t1 ON t3.i1 = t1.i1 +LEFT JOIN v4 +RIGHT JOIN t2 ON v4.i1 = t2.pk ON t1.i1 = t2.pk +WHERE t3.pk IN (2); +1 +drop view v4; +drop table t1,t2,t3,t4; SET optimizer_switch=@save_optimizer_switch; diff --git a/mysql-test/main/join_outer.test b/mysql-test/main/join_outer.test index 9118febc800..82127397bee 100644 --- a/mysql-test/main/join_outer.test +++ b/mysql-test/main/join_outer.test @@ -2084,5 +2084,22 @@ set optimizer_use_condition_selectivity= @tmp1; set use_stat_tables= @tmp2; set histogram_size= @tmp3; +--echo # Another test +CREATE TABLE t1 (i1 int) ; +CREATE TABLE t2 (pk int NOT NULL PRIMARY KEY) ; +CREATE TABLE t3 (pk int NOT NULL, i1 int, PRIMARY KEY (pk)) ; +INSERT INTO t3 VALUES (2, NULL); + +CREATE TABLE t4 (pk int NOT NULL, i1 int, PRIMARY KEY (pk), KEY i1 (i1)) ; +CREATE VIEW v4 AS SELECT * FROM t4; + +SELECT 1 +FROM t3 RIGHT JOIN t1 ON t3.i1 = t1.i1 + LEFT JOIN v4 + RIGHT JOIN t2 ON v4.i1 = t2.pk ON t1.i1 = t2.pk +WHERE t3.pk IN (2); + +drop view v4; +drop table t1,t2,t3,t4; SET optimizer_switch=@save_optimizer_switch; diff --git a/mysql-test/main/join_outer_jcl6.result b/mysql-test/main/join_outer_jcl6.result index 6f5e4b3e85e..f46f3e2df21 100644 --- a/mysql-test/main/join_outer_jcl6.result +++ b/mysql-test/main/join_outer_jcl6.result @@ -2575,6 +2575,21 @@ drop table t1,t2,t3; set optimizer_use_condition_selectivity= @tmp1; set use_stat_tables= @tmp2; set histogram_size= @tmp3; +# Another test +CREATE TABLE t1 (i1 int) ; +CREATE TABLE t2 (pk int NOT NULL PRIMARY KEY) ; +CREATE TABLE t3 (pk int NOT NULL, i1 int, PRIMARY KEY (pk)) ; +INSERT INTO t3 VALUES (2, NULL); +CREATE TABLE t4 (pk int NOT NULL, i1 int, PRIMARY KEY (pk), KEY i1 (i1)) ; +CREATE VIEW v4 AS SELECT * FROM t4; +SELECT 1 +FROM t3 RIGHT JOIN t1 ON t3.i1 = t1.i1 +LEFT JOIN v4 +RIGHT JOIN t2 ON v4.i1 = t2.pk ON t1.i1 = t2.pk +WHERE t3.pk IN (2); +1 +drop view v4; +drop table t1,t2,t3,t4; SET optimizer_switch=@save_optimizer_switch; set join_cache_level=default; show variables like 'join_cache_level'; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 39c77dc4dc2..a99b991af96 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4316,14 +4316,17 @@ void mark_join_nest_as_const(JOIN *join, } JOIN_TAB *tab= tbl->table->reginfo.join_tab; - tab->type= JT_CONST; - tab->info= ET_IMPOSSIBLE_ON_CONDITION; - tab->table->const_table= 1; - - join->const_table_map|= tab->table->map; - *found_const_table_map|= tab->table->map; - set_position(join,(*const_count)++,tab,(KEYUSE*) 0); - mark_as_null_row(tab->table); // All fields are NULL + if (!(join->const_table_map & tab->table->map)) + { + tab->type= JT_CONST; + tab->info= ET_IMPOSSIBLE_ON_CONDITION; + tab->table->const_table= 1; + + join->const_table_map|= tab->table->map; + *found_const_table_map|= tab->table->map; + set_position(join,(*const_count)++,tab,(KEYUSE*) 0); + mark_as_null_row(tab->table); // All fields are NULL + } } }

1 0

[Commits] c4c738e1ef9: Revert commit b2f39a5f567d006000aad8b431267298cf81b569 wrong
by jan 01 Nov '18

01 Nov '18

revision-id: c4c738e1ef983a0a4353957cf5d488a3f2cb0a58 (mariadb-10.0.36-69-gc4c738e1ef9) parent(s): b2f39a5f567d006000aad8b431267298cf81b569 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-01 09:27:59 +0200 message: Revert commit b2f39a5f567d006000aad8b431267298cf81b569 wrong branch. --- support-files/CMakeLists.txt | 7 --- support-files/wsrep.cnf.sh | 125 ------------------------------------------- 2 files changed, 132 deletions(-) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index d02da51194c..cc9eed6c7be 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -50,13 +50,6 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) ENDFOREACH() ENDIF() -IF(WITH_WSREP) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) -ENDIF() - IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh deleted file mode 100644 index 51ce3dca2dd..00000000000 --- a/support-files/wsrep.cnf.sh +++ /dev/null @@ -1,125 +0,0 @@ -# This file contains wsrep-related mysqld options. It should be included -# in the main MySQL configuration file. -# -# Options that need to be customized: -# - wsrep_provider -# - wsrep_cluster_address -# - wsrep_sst_auth -# The rest of defaults should work out of the box. - -## -## mysqld options _MANDATORY_ for correct opration of the cluster -## -[mysqld] - -# (This must be substituted by wsrep_format) -binlog_format=ROW - -# Currently only InnoDB storage engine is supported -default-storage-engine=innodb - -# to avoid issues with 'bulk mode inserts' using autoinc -innodb_autoinc_lock_mode=2 - -# Override bind-address -# In some systems bind-address defaults to 127.0.0.1, and with mysqldump SST -# it will have (most likely) disastrous consequences on donor node -bind-address=0.0.0.0 - -## -## WSREP options -## - -# Enable wsrep -wsrep_on=1 - -# Full path to wsrep provider library or 'none' -wsrep_provider=none - -# Provider specific configuration options -#wsrep_provider_options= - -# Logical cluster name. Should be the same for all nodes. -wsrep_cluster_name="my_wsrep_cluster" - -# Group communication system handle -#wsrep_cluster_address="dummy://" - -# Human-readable node name (non-unique). Hostname by default. -#wsrep_node_name= - -# Base replication <address|hostname>[:port] of the node. -# The values supplied will be used as defaults for state transfer receiving, -# listening ports and so on. Default: address of the first network interface. -#wsrep_node_address= - -# Address for incoming client connections. Autodetect by default. -#wsrep_node_incoming_address= - -# How many threads will process writesets from other nodes -wsrep_slave_threads=1 - -# DBUG options for wsrep provider -#wsrep_dbug_option - -# Generate fake primary keys for non-PK tables (required for multi-master -# and parallel applying operation) -wsrep_certify_nonPK=1 - -# Maximum number of rows in write set -wsrep_max_ws_rows=131072 - -# Maximum size of write set -wsrep_max_ws_size=1073741824 - -# to enable debug level logging, set this to 1 -wsrep_debug=0 - -# convert locking sessions into transactions -wsrep_convert_LOCK_to_trx=0 - -# how many times to retry deadlocked autocommits -wsrep_retry_autocommit=1 - -# change auto_increment_increment and auto_increment_offset automatically -wsrep_auto_increment_control=1 - -# retry autoinc insert, which failed for duplicate key error -wsrep_drupal_282555_workaround=0 - -# enable "strictly synchronous" semantics for read operations -wsrep_causal_reads=0 - -# Command to call when node status or cluster membership changes. -# Will be passed all or some of the following options: -# --status - new status of this node -# --uuid - UUID of the cluster -# --primary - whether the component is primary or not ("yes"/"no") -# --members - comma-separated list of members -# --index - index of this node in the list -wsrep_notify_cmd= - -## -## WSREP State Transfer options -## - -# State Snapshot Transfer method -wsrep_sst_method=rsync - -# Address which donor should send State Snapshot to. -# Should be the address of THIS node. DON'T SET IT TO DONOR ADDRESS!!! -# (SST method dependent. Defaults to the first IP of the first interface) -#wsrep_sst_receive_address= - -# SST authentication string. This will be used to send SST to joining nodes. -# Depends on SST method. For mysqldump method it is root:<root password> -wsrep_sst_auth=root: - -# Desired SST donor name. -#wsrep_sst_donor= - -# Reject client queries when donating SST (false) -#wsrep_sst_donor_rejects_queries=0 - -# Protocol version to use -# wsrep_protocol_version=

1 0

[Commits] b2f39a5f567: Add missing wsrep.cnf.sh
by jan 01 Nov '18

01 Nov '18

revision-id: b2f39a5f567d006000aad8b431267298cf81b569 (mariadb-10.0.36-68-gb2f39a5f567) parent(s): 75ceb6ff130cdac67fadc1d45cd64578a19b4835 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-01 09:15:41 +0200 message: Add missing wsrep.cnf.sh --- support-files/CMakeLists.txt | 7 +++ support-files/wsrep.cnf.sh | 125 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index cc9eed6c7be..d02da51194c 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -50,6 +50,13 @@ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) ENDFOREACH() ENDIF() +IF(WITH_WSREP) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/wsrep.cnf.sh + ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} @ONLY) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/wsrep.${ini_file_extension} + DESTINATION ${inst_location} COMPONENT IniFiles) +ENDIF() + IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) diff --git a/support-files/wsrep.cnf.sh b/support-files/wsrep.cnf.sh new file mode 100644 index 00000000000..51ce3dca2dd --- /dev/null +++ b/support-files/wsrep.cnf.sh @@ -0,0 +1,125 @@ +# This file contains wsrep-related mysqld options. It should be included +# in the main MySQL configuration file. +# +# Options that need to be customized: +# - wsrep_provider +# - wsrep_cluster_address +# - wsrep_sst_auth +# The rest of defaults should work out of the box. + +## +## mysqld options _MANDATORY_ for correct opration of the cluster +## +[mysqld] + +# (This must be substituted by wsrep_format) +binlog_format=ROW + +# Currently only InnoDB storage engine is supported +default-storage-engine=innodb + +# to avoid issues with 'bulk mode inserts' using autoinc +innodb_autoinc_lock_mode=2 + +# Override bind-address +# In some systems bind-address defaults to 127.0.0.1, and with mysqldump SST +# it will have (most likely) disastrous consequences on donor node +bind-address=0.0.0.0 + +## +## WSREP options +## + +# Enable wsrep +wsrep_on=1 + +# Full path to wsrep provider library or 'none' +wsrep_provider=none + +# Provider specific configuration options +#wsrep_provider_options= + +# Logical cluster name. Should be the same for all nodes. +wsrep_cluster_name="my_wsrep_cluster" + +# Group communication system handle +#wsrep_cluster_address="dummy://" + +# Human-readable node name (non-unique). Hostname by default. +#wsrep_node_name= + +# Base replication <address|hostname>[:port] of the node. +# The values supplied will be used as defaults for state transfer receiving, +# listening ports and so on. Default: address of the first network interface. +#wsrep_node_address= + +# Address for incoming client connections. Autodetect by default. +#wsrep_node_incoming_address= + +# How many threads will process writesets from other nodes +wsrep_slave_threads=1 + +# DBUG options for wsrep provider +#wsrep_dbug_option + +# Generate fake primary keys for non-PK tables (required for multi-master +# and parallel applying operation) +wsrep_certify_nonPK=1 + +# Maximum number of rows in write set +wsrep_max_ws_rows=131072 + +# Maximum size of write set +wsrep_max_ws_size=1073741824 + +# to enable debug level logging, set this to 1 +wsrep_debug=0 + +# convert locking sessions into transactions +wsrep_convert_LOCK_to_trx=0 + +# how many times to retry deadlocked autocommits +wsrep_retry_autocommit=1 + +# change auto_increment_increment and auto_increment_offset automatically +wsrep_auto_increment_control=1 + +# retry autoinc insert, which failed for duplicate key error +wsrep_drupal_282555_workaround=0 + +# enable "strictly synchronous" semantics for read operations +wsrep_causal_reads=0 + +# Command to call when node status or cluster membership changes. +# Will be passed all or some of the following options: +# --status - new status of this node +# --uuid - UUID of the cluster +# --primary - whether the component is primary or not ("yes"/"no") +# --members - comma-separated list of members +# --index - index of this node in the list +wsrep_notify_cmd= + +## +## WSREP State Transfer options +## + +# State Snapshot Transfer method +wsrep_sst_method=rsync + +# Address which donor should send State Snapshot to. +# Should be the address of THIS node. DON'T SET IT TO DONOR ADDRESS!!! +# (SST method dependent. Defaults to the first IP of the first interface) +#wsrep_sst_receive_address= + +# SST authentication string. This will be used to send SST to joining nodes. +# Depends on SST method. For mysqldump method it is root:<root password> +wsrep_sst_auth=root: + +# Desired SST donor name. +#wsrep_sst_donor= + +# Reject client queries when donating SST (false) +#wsrep_sst_donor_rejects_queries=0 + +# Protocol version to use +# wsrep_protocol_version=

1 0

[Commits] e16d91b889c: Fix merge error on tests.
by jan 31 Oct '18

31 Oct '18

revision-id: e16d91b889c3307ff1512d20221082e78cc8fcc0 (mariadb-galera-10.0.36-5-ge16d91b889c) parent(s): d6ee7ab1a1cec0143e66f3ac75d8cee7c60f69b0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-31 18:28:33 +0200 message: Fix merge error on tests. --- mysql-test/t/alter_table.test | 81 ++++++++++++++++++++++--------------------- mysql-test/t/grant.test | 38 ++++++++++---------- mysql-test/t/type_float.test | 41 +++++++++++----------- 3 files changed, 82 insertions(+), 78 deletions(-) diff --git a/mysql-test/t/alter_table.test b/mysql-test/t/alter_table.test index 30300efb34e..aea1a880a81 100644 --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@ -287,7 +287,7 @@ drop table t1; # set names koi8r; create table t1 (a char(10) character set koi8r); -insert into t1 values ('��'); +insert into t1 values ('��'); select a,hex(a) from t1; alter table t1 change a a char(10) character set cp1251; select a,hex(a) from t1; @@ -367,7 +367,7 @@ DROP TABLE T12207; # modified. In other words, the values were reinterpreted # as UTF8 instead of being converted. create table t1 (a text) character set koi8r; -insert into t1 values (_koi8r'��'); +insert into t1 values (_koi8r'��'); select hex(a) from t1; alter table t1 convert to character set cp1251; select hex(a) from t1; @@ -1346,52 +1346,55 @@ DROP TABLE t1, t2, t3; SET SQL_MODE=default; SET GLOBAL max_allowed_packet=default; +# +# Test of ALTER TABLE IF [NOT] EXISTS +# -SET GLOBAL max_allowed_packet=17825792; - ---connect(con1, localhost, root,,) -CREATE TABLE t1 (t1_fld1 TEXT); -CREATE TABLE t2 (t2_fld1 MEDIUMTEXT); -CREATE TABLE t3 (t3_fld1 LONGTEXT); - -INSERT INTO t1 VALUES (REPEAT('a',300)); -INSERT INTO t2 VALUES (REPEAT('b',65680)); -INSERT INTO t3 VALUES (REPEAT('c',16777300)); +CREATE TABLE t1 ( + id INT(11) NOT NULL, + x_param INT(11) DEFAULT NULL, + PRIMARY KEY (id) +) ENGINE=MYISAM; -SELECT LENGTH(t1_fld1) FROM t1; -SELECT LENGTH(t2_fld1) FROM t2; -SELECT LENGTH(t3_fld1) FROM t3; +ALTER TABLE t1 ADD COLUMN IF NOT EXISTS id INT, + ADD COLUMN IF NOT EXISTS lol INT AFTER id; +ALTER TABLE t1 ADD COLUMN IF NOT EXISTS lol INT AFTER id; +ALTER TABLE t1 DROP COLUMN IF EXISTS lol; +ALTER TABLE t1 DROP COLUMN IF EXISTS lol; ---echo # With strict mode -SET SQL_MODE='STRICT_ALL_TABLES'; +ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); +ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); +ALTER TABLE t1 MODIFY IF EXISTS lol INT; ---error ER_DATA_TOO_LONG -ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT; ---error ER_DATA_TOO_LONG -ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT; ---error ER_DATA_TOO_LONG -ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT; - ---echo # With non-strict mode -SET SQL_MODE=''; +DROP INDEX IF EXISTS x_param ON t1; +DROP INDEX IF EXISTS x_param ON t1; +CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); +CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); +SHOW CREATE TABLE t1; +DROP TABLE t1; -ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT; -ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT; -ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT; +CREATE TABLE t1 ( + id INT(11) NOT NULL, + x_param INT(11) DEFAULT NULL, + PRIMARY KEY (id) +) ENGINE=INNODB; -SELECT LENGTH(my_t1_fld1) FROM t1; -SELECT LENGTH(my_t2_fld1) FROM t2; -SELECT LENGTH(my_t3_fld1) FROM t3; +CREATE TABLE t2 ( + id INT(11) NOT NULL) ENGINE=INNODB; -# Cleanup ---disconnect con1 ---source include/wait_until_disconnected.inc +ALTER TABLE t1 ADD COLUMN IF NOT EXISTS id INT, + ADD COLUMN IF NOT EXISTS lol INT AFTER id; +ALTER TABLE t1 ADD COLUMN IF NOT EXISTS lol INT AFTER id; +ALTER TABLE t1 DROP COLUMN IF EXISTS lol; +ALTER TABLE t1 DROP COLUMN IF EXISTS lol; ---connection default -DROP TABLE t1, t2, t3; +ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); +ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); +ALTER TABLE t1 MODIFY IF EXISTS lol INT; -SET SQL_MODE=default; -SET GLOBAL max_allowed_packet=default; +DROP INDEX IF EXISTS x_param ON t1; +DROP INDEX IF EXISTS x_param ON t1; +CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); SHOW CREATE TABLE t1; diff --git a/mysql-test/t/grant.test b/mysql-test/t/grant.test index b96f8033be5..f2dfb01cc39 100644 --- a/mysql-test/t/grant.test +++ b/mysql-test/t/grant.test @@ -210,26 +210,26 @@ drop user mysqltest_1@localhost; # Bug#3403 Wrong encoding in SHOW GRANTS output # SET NAMES koi8r; -CREATE DATABASE ��; -USE ��; -CREATE TABLE �� (�� INT); +CREATE DATABASE ��; +USE ��; +CREATE TABLE �� (�� INT); -GRANT SELECT ON ��.* TO ��@localhost; -SHOW GRANTS FOR ��@localhost; -REVOKE SELECT ON ��.* FROM ��@localhost; +GRANT SELECT ON ��.* TO ��@localhost; +SHOW GRANTS FOR ��@localhost; +REVOKE SELECT ON ��.* FROM ��@localhost; -GRANT SELECT ON ��.�� TO ��@localhost; -SHOW GRANTS FOR ��@localhost; -REVOKE SELECT ON ��.�� FROM ��@localhost; +GRANT SELECT ON ��.�� TO ��@localhost; +SHOW GRANTS FOR ��@localhost; +REVOKE SELECT ON ��.�� FROM ��@localhost; -GRANT SELECT (��) ON ��.�� TO ��@localhost; -SHOW GRANTS FOR ��@localhost; -REVOKE SELECT (��) ON ��.�� FROM ��@localhost; +GRANT SELECT (��) ON ��.�� TO ��@localhost; +SHOW GRANTS FOR ��@localhost; +REVOKE SELECT (��) ON ��.�� FROM ��@localhost; # Revoke does not drop user. Leave a clean user table for the next tests. -DROP USER ��@localhost; +DROP USER ��@localhost; -DROP DATABASE ��; +DROP DATABASE ��; SET NAMES latin1; # @@ -512,14 +512,14 @@ set @user123="non-existent"; select * from mysql.db where user=@user123; set names koi8r; -create database ��; -grant select on ��.* to root@localhost; -select hex(Db) from mysql.db where Db='��'; +create database ��; +grant select on ��.* to root@localhost; +select hex(Db) from mysql.db where Db='��'; show grants for root@localhost; flush privileges; show grants for root@localhost; -drop database ��; -revoke all privileges on ��.* from root@localhost; +drop database ��; +revoke all privileges on ��.* from root@localhost; show grants for root@localhost; set names latin1; diff --git a/mysql-test/t/type_float.test b/mysql-test/t/type_float.test index ebed9550afe..5dfb4a75bb3 100644 --- a/mysql-test/t/type_float.test +++ b/mysql-test/t/type_float.test @@ -363,32 +363,33 @@ DROP TABLE t1; --echo # ---echo # MDEV-17249 MAKETIME(-1e50,0,0) returns a wrong result +--echo # Bug #13500371 63704: CONVERSION OF '1.' TO A NUMBER GIVES ERROR 1265 +--echo # (WARN_DATA_TRUNCATED) --echo # -SELECT LEFT('a',EXP(50)); -SELECT LEFT('a', COALESCE(1e30)); - -CREATE TABLE t1 (a FLOAT); -INSERT INTO t1 VALUES (1e30); -SELECT LEFT('a',a), LEFT('a',1e30) FROM t1; +CREATE TABLE t1 (f FLOAT); +INSERT INTO t1 VALUES ('1.'); +INSERT INTO t1 VALUES ('2.0.'); +INSERT INTO t1 VALUES ('.'); +SELECT * FROM t1 ORDER BY f; DROP TABLE t1; -PREPARE stmt FROM 'SELECT LEFT(111,?)'; -SET @a=1e30; -EXECUTE stmt USING @a; -DEALLOCATE PREPARE stmt; -CREATE TABLE t1 (a INT); -INSERT INTO t1 VALUES (1),(2),(3); -SELECT LEFT('a',(SELECT 1e30 FROM t1 LIMIT 1)); -DROP TABLE t1; +--echo # +--echo # Start of 10.0 tests +--echo # -CREATE TABLE t1 (a DOUBLE); -INSERT INTO t1 VALUES (1e30),(0); -SELECT LEFT('a', SUM(a)) FROM t1; -SELECT LEFT('a', AVG(a)) FROM t1; -DROP TABLE t1; +--echo # +--echo # MDEV-6950 Bad results with joins comparing DATE/DATETIME and INT/DECIMAL/DOUBLE/ENUM/VARCHAR columns +--echo # +CREATE TABLE t1 (a DATETIME PRIMARY KEY); +INSERT INTO t1 VALUES ('1999-01-01 00:00:00'); +CREATE TABLE t2 (a DOUBLE); +INSERT INTO t2 VALUES (19990101000000); +INSERT INTO t2 VALUES (990101000000); +SELECT t1.* FROM t1,t2 WHERE t1.a=t2.a; +SELECT t1.* FROM t1 LEFT JOIN t2 ON t1.a=t2.a; +ALTER TABLE t2 ADD PRIMARY KEY(a); SELECT t1.* FROM t1,t2 WHERE t1.a=t2.a; SELECT t1.* FROM t1 LEFT JOIN t2 ON t1.a=t2.a; --echo # t2 should NOT be eliminated

1 0

[Commits] c0f67cc1: Revert MDEV-17243: "FSM: no such a transition ABORTING -> REPLICATING"
by jan 31 Oct '18

31 Oct '18

revision-id: c0f67cc18569a9f9b060b33094dba261202705da (mariadb-25.3.19-18-gc0f67cc1) parent(s): 56bc9f8a19a360465f561a2f6e254cddb10a50b0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-31 11:33:13 +0200 message: Revert MDEV-17243: "FSM: no such a transition ABORTING -> REPLICATING" --- galera/src/replicator_smm.hpp | 2 +- galera/src/wsdb.cpp | 78 ++++++------------------------------------- galera/src/wsdb.hpp | 19 ----------- 3 files changed, 11 insertions(+), 88 deletions(-) diff --git a/galera/src/replicator_smm.hpp b/galera/src/replicator_smm.hpp index d8de2e7a..9259ff59 100644 --- a/galera/src/replicator_smm.hpp +++ b/galera/src/replicator_smm.hpp @@ -349,7 +349,7 @@ namespace galera case OOOC: return true; case LOCAL_OOOC: - if (trx_.is_local()) { return true; } + return trx_.is_local(); // in case of remote trx fall through // fall through case NO_OOOC: diff --git a/galera/src/wsdb.cpp b/galera/src/wsdb.cpp index f103ce59..0aa42c5a 100644 --- a/galera/src/wsdb.cpp +++ b/galera/src/wsdb.cpp @@ -35,7 +35,6 @@ galera::Wsdb::Wsdb() : trx_pool_ (TrxHandle::LOCAL_STORAGE_SIZE(), 512, "LocalTrxHandle"), trx_map_ (), - conn_trx_map_(), trx_mutex_ (), conn_map_ (), conn_mutex_ () @@ -56,9 +55,6 @@ galera::Wsdb::~Wsdb() assert(conn_map_.size() == 0); #else for_each(trx_map_.begin(), trx_map_.end(), Unref2nd<TrxMap::value_type>()); - for_each(conn_trx_map_.begin(), - conn_trx_map_.end(), - Unref2nd<ConnTrxMap::value_type>()); #endif // !NDEBUG } @@ -68,31 +64,8 @@ galera::Wsdb::find_trx(wsrep_trx_id_t const trx_id) { gu::Lock lock(trx_mutex_); - galera::TrxHandle* trx; - /* trx-id = 0 is safe-guard condition. - trx-id is generally assigned from thd->query-id and - query-id default is 0. If background thread try to assign - wsrep_next_trx_id before setting query-id we will hit - this assertion: */ - assert(trx_id != 0); - - if (trx_id != wsrep_trx_id_t(-1)) - { - /* trx_id is valid and unique. Search for this trx_id in the - trx_id -> trx map: */ - TrxMap::iterator const i(trx_map_.find(trx_id)); - trx = (trx_map_.end() == i ? NULL : i->second); - } - else - { - /* trx_id is default, so search for repsective connection id - in connection-transaction map: */ - gu_thread_t const id = gu_thread_self(); - ConnTrxMap::iterator const i(conn_trx_map_.find(id)); - trx = (conn_trx_map_.end() == i ? NULL : i->second); - } - - return (trx); + TrxMap::iterator const i(trx_map_.find(trx_id)); + return (trx_map_.end() == i ? NULL : i->second); } @@ -105,28 +78,10 @@ galera::Wsdb::create_trx(const TrxHandle::Params& params, gu::Lock lock(trx_mutex_); - galera::TrxHandle* trx_ref; - if (trx_id != wsrep_trx_id_t(-1)) - { - /* trx_id is valid, add it to trx-map as valid trx_id, which - is unique accross connections: */ - std::pair<TrxMap::iterator, bool> i - (trx_map_.insert(std::make_pair(trx_id, trx))); - if (gu_unlikely(i.second == false)) gu_throw_fatal; - trx_ref = i.first->second; - } - else - { - /* trx_id is default so add trx object to connection map - that is maintained based on gu_thread_id (actually it is - alias for connection_id): */ - std::pair<ConnTrxMap::iterator, bool> i - (conn_trx_map_.insert(std::make_pair(gu_thread_self(), trx))); - if (gu_unlikely(i.second == false)) gu_throw_fatal; - trx_ref = i.first->second; - } - - return (trx_ref); + std::pair<TrxMap::iterator, bool> i + (trx_map_.insert(std::make_pair(trx_id, trx))); + if (gu_unlikely(i.second == false)) gu_throw_fatal; + return i.first->second; } @@ -196,24 +151,11 @@ galera::Wsdb::get_conn_query(const TrxHandle::Params& params, void galera::Wsdb::discard_trx(wsrep_trx_id_t trx_id) { gu::Lock lock(trx_mutex_); - if (trx_id != wsrep_trx_id_t(-1)) - { - TrxMap::iterator i; - if ((i = trx_map_.find(trx_id)) != trx_map_.end()) - { - i->second->unref(); - trx_map_.erase(i); - } - } - else + TrxMap::iterator i; + if ((i = trx_map_.find(trx_id)) != trx_map_.end()) { - ConnTrxMap::iterator i; - gu_thread_t id = gu_thread_self(); - if ((i = conn_trx_map_.find(id)) != conn_trx_map_.end()) - { - i->second->unref(); - conn_trx_map_.erase(i); - } + i->second->unref(); + trx_map_.erase(i); } } diff --git a/galera/src/wsdb.hpp b/galera/src/wsdb.hpp index 072ecffc..3b78f031 100644 --- a/galera/src/wsdb.hpp +++ b/galera/src/wsdb.hpp @@ -7,7 +7,6 @@ #include "trx_handle.hpp" #include "wsrep_api.h" #include "gu_unordered.hpp" -#include "gu_thread.hpp" namespace galera { @@ -56,23 +55,6 @@ namespace galera typedef gu::UnorderedMap<wsrep_trx_id_t, TrxHandle*, TrxHash> TrxMap; - /* TrxMap structure doesn't take into consideration presence of - two trx objects with same trx_id (2^64 - 1 which is default trx_id) - belonging to two different connections. - This eventually causes same trx object to get shared among two - different unrelated connections which causes state inconsistency - leading to crash (RACE CONDITION). - This problem could be solved by taking into consideration conn-id, - but that would invite interface change. To avoid this we maintain a - separate map of such trx objects based on gu_thread_id: */ - class ConnTrxHash - { - public: - size_t operator()(const gu_thread_t& key) const { return key; } - }; - - typedef gu::UnorderedMap<gu_thread_t, TrxHandle*, ConnTrxHash> ConnTrxMap; - class ConnHash { public: @@ -135,7 +117,6 @@ namespace galera TrxHandle::LocalPool trx_pool_; TrxMap trx_map_; - ConnTrxMap conn_trx_map_; gu::Mutex trx_mutex_; ConnMap conn_map_; gu::Mutex conn_mutex_;

1 0

[Commits] d6ee7ab1a1c: Merge remote-tracking branch 'origin/10.0' into bb-10.0-galera
by jan 31 Oct '18

31 Oct '18

revision-id: d6ee7ab1a1cec0143e66f3ac75d8cee7c60f69b0 (mariadb-galera-10.0.36-4-gd6ee7ab1a1c) parent(s): b0fe082b365d989fcf905e5c40c3fe60fd756858 a737135ae39dafe8b1136386ce23dfa8bed877f9 author: Jan Lindström committer: Jan Lindström timestamp: 2018-10-31 08:46:37 +0200 message: Merge remote-tracking branch 'origin/10.0' into bb-10.0-galera .gitignore | 1 + CREDITS | 4 +- debian/dist/Ubuntu/rules | 1 + include/my_bit.h | 8 +- include/mysql/plugin.h | 12 + mysql-test/extra/rpl_tests/rpl_foreign_key.test | 62 - mysql-test/include/have_32bit.inc | 9 + mysql-test/include/have_64bit.inc | 9 + mysql-test/include/maybe_debug.combinations | 5 + mysql-test/include/maybe_debug.inc | 3 + mysql-test/r/contributors.result | 4 +- mysql-test/r/create_or_replace.result | 35 + mysql-test/r/ctype_uca.result | 21 + mysql-test/r/func_concat.result | 20 + mysql-test/r/gis.result | 16 + mysql-test/r/group_min_max.result | 28 + mysql-test/r/order_by_zerolength-4285.result | 20 + mysql-test/r/partition_explicit_prune.result | 19 + mysql-test/r/selectivity.result | 44 +- mysql-test/r/selectivity_innodb.result | 44 +- mysql-test/r/stat_tables.result | 13 + mysql-test/r/stat_tables_innodb.result | 13 + mysql-test/r/subselect_extra_no_semijoin.result | 19 + mysql-test/r/type_year.result | 13 + mysql-test/suite.pm | 3 + .../suite/innodb/r/alter_inplace_perfschema.result | 15 + mysql-test/suite/innodb/r/foreign-keys.result | 73 + mysql-test/suite/innodb/r/foreign_key.result | 51 + .../suite/innodb/r/innodb-alter-debug.result | 14 + .../suite/innodb/r/table_flags,4k,debug.rdiff | 128 + ...flags,4k.rdiff => table_flags,4k,release.rdiff} | 0 .../suite/innodb/r/table_flags,8k,debug.rdiff | 128 + ...flags,8k.rdiff => table_flags,8k,release.rdiff} | 0 mysql-test/suite/innodb/r/table_flags,debug.rdiff | 128 + .../suite/innodb/t/alter_inplace_perfschema.opt | 2 + .../suite/innodb/t/alter_inplace_perfschema.test | 40 + mysql-test/suite/innodb/t/foreign-keys.test | 87 + mysql-test/suite/innodb/t/foreign_key.test | 75 + mysql-test/suite/innodb/t/innodb-alter-debug.test | 25 +- mysql-test/suite/innodb/t/table_flags.test | 4 + .../suite/innodb_fts/r/fts_kill_query.result | 6 + mysql-test/suite/innodb_fts/t/fts_kill_query.test | 30 + mysql-test/suite/maria/create.result | 33 + mysql-test/suite/maria/create.test | 42 + .../suite/rpl/r/rpl_foreign_key_innodb.result | 5 +- mysql-test/suite/rpl/t/rpl_15919-master.opt | 1 - mysql-test/suite/rpl/t/rpl_15919.test | 4 +- mysql-test/suite/rpl/t/rpl_foreign_key_innodb.test | 63 +- .../r/innodb_ft_result_cache_limit_32.result | 7 + .../r/innodb_ft_result_cache_limit_64.result | 5 + .../suite/sys_vars/r/thread_pool_size_high.result | 1 + .../t/innodb_ft_result_cache_limit_32.test | 9 + .../t/innodb_ft_result_cache_limit_64.test | 9 + .../suite/sys_vars/t/thread_pool_size_high.test | 1 + mysql-test/t/alter_table.test | 48 +- mysql-test/t/create_or_replace.test | 45 + mysql-test/t/ctype_uca.test | 18 + mysql-test/t/func_concat.test | 22 + mysql-test/t/gis.test | 15 + mysql-test/t/grant.test | 43 +- mysql-test/t/group_min_max.test | 17 + mysql-test/t/lowercase_fs_off.test | 10 + mysql-test/t/order_by_zerolength-4285.test | 13 + mysql-test/t/partition_explicit_prune.test | 19 + mysql-test/t/selectivity.test | 36 + mysql-test/t/sp-security.test | 12 +- mysql-test/t/stat_tables.test | 12 + mysql-test/t/subselect_extra_no_semijoin.test | 31 +- mysql-test/t/type_datetime.test | 10 +- mysql-test/t/type_float.test | 29 + mysql-test/t/type_year.test | 16 + mysql-test/unstable-tests | 82 +- mysys/ptr_cmp.c | 7 + scripts/mysql_install_db.sh | 2 +- sql/contributors.h | 4 +- sql/field.cc | 17 +- sql/ha_partition.cc | 9 +- sql/ha_partition.h | 1 - sql/item_cmpfunc.cc | 15 +- sql/item_subselect.cc | 2 +- sql/lex.h | 6 +- sql/lock.cc | 17 - sql/lock.h | 1 - sql/mysqld.cc | 11 + sql/opt_range.cc | 27 +- sql/sp_head.cc | 33 +- sql/sql_acl.cc | 1 - sql/sql_alter.h | 2 +- sql/sql_base.cc | 150 +- sql/sql_base.h | 2 + sql/sql_class.cc | 3 +- sql/sql_class.h | 2 - sql/sql_insert.cc | 2 +- sql/sql_lex.h | 4 +- sql/sql_select.cc | 2 +- sql/sql_show.cc | 9 +- sql/sql_statistics.cc | 3 + sql/sql_statistics.h | 29 +- sql/sql_table.cc | 64 +- sql/sql_yacc.yy | 38 +- sql/table.cc | 20 + sql/table.h | 49 +- sql/table_cache.cc | 3 +- storage/connect/CMakeLists.txt | 9 + storage/connect/connect.cc | 2 +- storage/connect/domdoc.cpp | 4 +- storage/connect/filamtxt.cpp | 6 +- storage/connect/filamvct.cpp | 28 +- storage/connect/global.h | 4 +- storage/connect/ha_connect.cc | 148 +- storage/connect/ha_connect.h | 6 +- storage/connect/javaconn.cpp | 43 +- storage/connect/javaconn.h | 1 + storage/connect/jdbconn.cpp | 38 +- storage/connect/jmgoconn.cpp | 6 +- storage/connect/json.h | 3 + storage/connect/jsonudf.cpp | 6 +- storage/connect/mycat.cc | 15 +- storage/connect/mysql-test/connect/disabled.def | 23 +- storage/connect/mysql-test/connect/r/jdbc.result | 3 +- .../mysql-test/connect/r/json_java_2.result | 1 - .../mysql-test/connect/r/json_java_3.result | 1 - .../mysql-test/connect/r/mongo_java_2.result | 1 - .../mysql-test/connect/r/mongo_java_3.result | 1 - .../connect/mysql-test/connect/r/mysql_exec.result | 6 + .../mysql-test/connect/r/odbc_postgresql.result | 18 +- storage/connect/mysql-test/connect/r/xml2.result | 31 - .../connect/mysql-test/connect/t/json_java_2.test | 2 + .../connect/mysql-test/connect/t/json_java_3.test | 2 + .../connect/mysql-test/connect/t/mongo_java_2.test | 2 + .../connect/mysql-test/connect/t/mongo_java_3.test | 2 + storage/connect/mysql-test/connect/t/xml2.test | 36 +- storage/connect/odbconn.cpp | 10 +- storage/connect/tabext.cpp | 8 +- storage/connect/tabjdbc.cpp | 9 +- storage/connect/tabjmg.cpp | 11 +- storage/connect/tabjson.h | 1 + storage/connect/tabmysql.cpp | 11 +- storage/connect/tabodbc.cpp | 13 +- storage/connect/tabpivot.cpp | 166 +- storage/connect/tabutil.cpp | 2 +- storage/connect/tabvct.cpp | 6 +- storage/connect/user_connect.cc | 1 + storage/heap/hp_create.c | 2 +- storage/innobase/buf/buf0buf.cc | 2 +- storage/innobase/buf/buf0lru.cc | 2 +- storage/innobase/dict/dict0crea.cc | 16 + storage/innobase/dict/dict0dict.cc | 7 +- storage/innobase/fts/fts0ast.cc | 9 +- storage/innobase/fts/fts0fts.cc | 24 +- storage/innobase/fts/fts0pars.cc | 16 +- storage/innobase/fts/fts0pars.y | 16 +- storage/innobase/fts/fts0que.cc | 23 +- storage/innobase/handler/ha_innodb.cc | 108 +- storage/innobase/handler/handler0alter.cc | 55 +- storage/innobase/include/dict0mem.h | 3 + storage/innobase/include/fts0ast.h | 5 +- storage/innobase/include/fts0fts.h | 2 +- storage/innobase/include/fts0types.h | 4 +- storage/innobase/include/os0file.h | 6 +- storage/innobase/include/row0ftsort.h | 9 + storage/innobase/include/univ.i | 2 +- storage/innobase/row/row0ftsort.cc | 1 - storage/innobase/row/row0import.cc | 5 +- storage/innobase/row/row0merge.cc | 14 +- storage/innobase/row/row0mysql.cc | 171 +- storage/innobase/row/row0sel.cc | 4 +- storage/innobase/trx/trx0purge.cc | 2 +- storage/innobase/trx/trx0trx.cc | 2 +- storage/mroonga/ha_mroonga.cpp | 6 +- .../mysql-test/storage_engine/disabled.def | 2 + storage/perfschema/unittest/pfs-t.cc | 5 +- storage/tokudb/CMakeLists.txt | 8 +- storage/tokudb/PerconaFT/CMakeLists.txt | 3 +- .../cmake_modules/TokuSetupCompiler.cmake | 3 + .../tokudb/PerconaFT/ft/cachetable/cachetable.cc | 21 +- .../tokudb/PerconaFT/ft/cachetable/cachetable.h | 8 +- .../tokudb/PerconaFT/ft/ft-cachetable-wrappers.cc | 3 - storage/tokudb/PerconaFT/ft/ft-test-helpers.cc | 3 - storage/tokudb/PerconaFT/ft/ft.h | 3 + storage/tokudb/PerconaFT/ft/node.cc | 2 + .../PerconaFT/ft/serialize/block_allocator.cc | 2 +- .../tokudb/PerconaFT/ft/tests/cachetable-4357.cc | 4 - .../tokudb/PerconaFT/ft/tests/cachetable-4365.cc | 4 - .../tokudb/PerconaFT/ft/tests/cachetable-5097.cc | 6 +- .../tokudb/PerconaFT/ft/tests/cachetable-5978-2.cc | 7 +- .../tokudb/PerconaFT/ft/tests/cachetable-5978.cc | 13 +- .../PerconaFT/ft/tests/cachetable-all-write.cc | 5 +- .../ft/tests/cachetable-checkpoint-pending.cc | 8 +- .../ft/tests/cachetable-checkpoint-pinned-nodes.cc | 6 +- .../ft/tests/cachetable-cleaner-checkpoint.cc | 5 +- .../ft/tests/cachetable-cleaner-checkpoint2.cc | 5 +- .../cachetable-cleaner-thread-attrs-accumulate.cc | 8 +- .../cachetable-cleaner-thread-everything-pinned.cc | 5 +- ...etable-cleaner-thread-nothing-needs-flushing.cc | 5 +- .../cachetable-cleaner-thread-same-fullhash.cc | 7 +- .../ft/tests/cachetable-cleaner-thread-simple.cc | 7 +- .../ft/tests/cachetable-clock-eviction.cc | 9 +- .../ft/tests/cachetable-clock-eviction2.cc | 9 +- .../ft/tests/cachetable-clock-eviction3.cc | 9 +- .../ft/tests/cachetable-clock-eviction4.cc | 9 +- .../ft/tests/cachetable-clone-checkpoint.cc | 5 +- .../cachetable-clone-partial-fetch-pinned-node.cc | 7 +- .../ft/tests/cachetable-clone-partial-fetch.cc | 7 +- .../ft/tests/cachetable-clone-pin-nonblocking.cc | 7 +- .../ft/tests/cachetable-clone-unpin-remove.cc | 5 +- .../ft/tests/cachetable-eviction-close-test.cc | 4 - .../ft/tests/cachetable-eviction-close-test2.cc | 4 - .../ft/tests/cachetable-eviction-getandpin-test.cc | 14 +- .../tests/cachetable-eviction-getandpin-test2.cc | 12 +- .../ft/tests/cachetable-fetch-inducing-evictor.cc | 15 +- .../ft/tests/cachetable-flush-during-cleaner.cc | 3 +- .../ft/tests/cachetable-getandpin-test.cc | 8 +- .../cachetable-kibbutz_and_flush_cachefile.cc | 3 +- .../PerconaFT/ft/tests/cachetable-partial-fetch.cc | 18 +- .../ft/tests/cachetable-pin-checkpoint.cc | 6 - .../cachetable-pin-nonblocking-checkpoint-clean.cc | 9 +- .../ft/tests/cachetable-prefetch-close-test.cc | 2 - .../ft/tests/cachetable-prefetch-getandpin-test.cc | 12 +- .../ft/tests/cachetable-put-checkpoint.cc | 9 - .../PerconaFT/ft/tests/cachetable-simple-clone.cc | 7 +- .../PerconaFT/ft/tests/cachetable-simple-clone2.cc | 5 +- .../PerconaFT/ft/tests/cachetable-simple-close.cc | 20 +- .../ft/tests/cachetable-simple-maybe-get-pin.cc | 3 +- .../ft/tests/cachetable-simple-pin-cheap.cc | 9 +- .../ft/tests/cachetable-simple-pin-dep-nodes.cc | 8 +- .../cachetable-simple-pin-nonblocking-cheap.cc | 19 +- .../ft/tests/cachetable-simple-pin-nonblocking.cc | 13 +- .../PerconaFT/ft/tests/cachetable-simple-pin.cc | 11 +- .../ft/tests/cachetable-simple-put-dep-nodes.cc | 6 +- .../cachetable-simple-read-pin-nonblocking.cc | 13 +- .../ft/tests/cachetable-simple-read-pin.cc | 13 +- .../cachetable-simple-unpin-remove-checkpoint.cc | 7 +- .../PerconaFT/ft/tests/cachetable-simple-verify.cc | 5 +- .../tokudb/PerconaFT/ft/tests/cachetable-test.cc | 22 +- .../ft/tests/cachetable-unpin-and-remove-test.cc | 4 +- .../cachetable-unpin-remove-and-checkpoint.cc | 6 +- .../PerconaFT/ft/tests/cachetable-unpin-test.cc | 2 - storage/tokudb/PerconaFT/ft/tests/test-TDB2-pe.cc | 178 + storage/tokudb/PerconaFT/ft/tests/test-TDB89.cc | 208 + storage/tokudb/PerconaFT/ft/txn/rollback-apply.cc | 2 + storage/tokudb/PerconaFT/ft/txn/rollback.cc | 2 +- storage/tokudb/PerconaFT/ftcxx/malloc_utils.cpp | 2 +- storage/tokudb/PerconaFT/ftcxx/malloc_utils.hpp | 2 +- storage/tokudb/PerconaFT/portability/memory.cc | 14 +- storage/tokudb/PerconaFT/portability/toku_assert.h | 2 +- .../tokudb/PerconaFT/portability/toku_debug_sync.h | 3 +- .../PerconaFT/portability/toku_instr_mysql.cc | 6 +- .../PerconaFT/portability/toku_instrumentation.h | 6 +- .../PerconaFT/portability/toku_portability.h | 2 +- .../tokudb/PerconaFT/portability/toku_race_tools.h | 2 +- storage/tokudb/PerconaFT/src/tests/get_last_key.cc | 32 +- storage/tokudb/PerconaFT/src/ydb.cc | 3 + storage/tokudb/PerconaFT/src/ydb_lib.cc | 2 +- storage/tokudb/PerconaFT/util/dmt.cc | 4 +- storage/tokudb/PerconaFT/util/minicron.cc | 3 +- storage/tokudb/PerconaFT/util/scoped_malloc.cc | 2 +- .../util/tests/minicron-change-period-data-race.cc | 66 + storage/tokudb/ha_tokudb.cc | 337 +- storage/tokudb/ha_tokudb.h | 100 +- storage/tokudb/ha_tokudb_admin.cc | 8 +- storage/tokudb/ha_tokudb_alter_55.cc | 4 + storage/tokudb/ha_tokudb_alter_56.cc | 265 +- storage/tokudb/ha_tokudb_alter_common.cc | 6 +- storage/tokudb/ha_tokudb_update.cc | 96 +- storage/tokudb/hatoku_cmp.cc | 33 +- storage/tokudb/hatoku_cmp.h | 14 +- storage/tokudb/hatoku_defines.h | 64 +- storage/tokudb/hatoku_hton.cc | 183 +- storage/tokudb/hatoku_hton.h | 25 +- storage/tokudb/mysql-test/rpl/disabled.def | 1 + .../r/rpl_mixed_replace_into.result | 0 .../rpl/r/rpl_parallel_tokudb_delete_pk.result | 5 - ...pl_parallel_tokudb_update_pk_uc0_lookup0.result | 5 - .../rpl/r/rpl_parallel_tokudb_write_pk.result | 2 - .../r/rpl_row_replace_into.result | 0 .../r/rpl_stmt_replace_into.result | 0 .../mysql-test/rpl/r/rpl_xa_interleave.result | 59 + .../t/rpl_mixed_replace_into.test | 0 .../t/rpl_row_replace_into.test | 0 .../t/rpl_stmt_replace_into.test | 0 .../tokudb/mysql-test/rpl/t/rpl_xa_interleave.test | 103 + .../tokudb/include/fast_update_gen_footer.inc | 2 + .../include/fast_update_gen_footer_silent.inc | 9 + .../tokudb/include/fast_update_gen_header.inc | 6 + .../mysql-test/tokudb/include/fast_update_int.inc | 48 + .../tokudb/include/fast_upsert_gen_header.inc | 6 + .../mysql-test/tokudb/include/fast_upsert_int.inc | 19 + .../tokudb/mysql-test/tokudb/include/have_mrr.inc | 0 .../tokudb/include/setup_fast_update_upsert.inc | 8 + .../tokudb/mysql-test/tokudb/r/compressions.result | 11 + .../tokudb/r/fast_update_binlog_mixed.result | 225 +- .../tokudb/r/fast_update_binlog_row.result | 19 +- .../tokudb/r/fast_update_binlog_statement.result | 222 +- .../mysql-test/tokudb/r/fast_update_blobs.result | 18253 +--------- .../r/fast_update_blobs_fixed_varchar.result | 33026 ------------------ .../tokudb/r/fast_update_blobs_with_varchar.result | 32771 +----------------- .../mysql-test/tokudb/r/fast_update_char.result | 60 +- .../tokudb/r/fast_update_deadlock.result | 19 +- .../tokudb/r/fast_update_decr_floor.result | 314 +- .../r/fast_update_disable_slow_update.result | 7 - .../mysql-test/tokudb/r/fast_update_error.result | 12 +- .../mysql-test/tokudb/r/fast_update_int.result | 562 +- .../tokudb/r/fast_update_int_bounds.result | 52 +- .../mysql-test/tokudb/r/fast_update_key.result | 54 +- .../mysql-test/tokudb/r/fast_update_sqlmode.result | 21 +- .../tokudb/r/fast_update_uint_bounds.result | 36 +- .../mysql-test/tokudb/r/fast_update_varchar.result | 13575 +------- .../mysql-test/tokudb/r/fast_upsert_bin_pad.result | Bin 659 -> 738 bytes .../mysql-test/tokudb/r/fast_upsert_char.result | 24 +- .../tokudb/r/fast_upsert_deadlock.result | 19 +- .../mysql-test/tokudb/r/fast_upsert_int.result | 428 +- .../mysql-test/tokudb/r/fast_upsert_key.result | 43 +- .../mysql-test/tokudb/r/fast_upsert_sqlmode.result | 23 +- .../mysql-test/tokudb/r/fast_upsert_values.result | 18 +- .../tokudb/mysql-test/tokudb/r/tokudb_mrr.result | 326 + storage/tokudb/mysql-test/tokudb/suite.pm | 6 + .../tokudb/mysql-test/tokudb/t/compressions.test | 68 + storage/tokudb/mysql-test/tokudb/t/disabled.def | 24 - .../tokudb/t/fast_update_binlog_mixed-master.opt | 2 + .../tokudb/t/fast_update_binlog_mixed.test | 15 +- .../tokudb/t/fast_update_binlog_row-master.opt | 2 + .../tokudb/t/fast_update_binlog_row.test | 19 +- .../t/fast_update_binlog_statement-master.opt | 2 + .../tokudb/t/fast_update_binlog_statement.test | 15 +- .../mysql-test/tokudb/t/fast_update_blobs.py | 57 - .../mysql-test/tokudb/t/fast_update_blobs.test | 18575 +---------- .../tokudb/t/fast_update_blobs_fixed_varchar.py | 63 - .../tokudb/t/fast_update_blobs_fixed_varchar.test | 33287 ------------------- .../tokudb/t/fast_update_blobs_with_varchar.py | 62 - .../tokudb/t/fast_update_blobs_with_varchar.test | 33115 +----------------- .../mysql-test/tokudb/t/fast_update_char.test | 66 +- .../mysql-test/tokudb/t/fast_update_deadlock.test | 21 +- .../mysql-test/tokudb/t/fast_update_decr_floor.py | 58 - .../tokudb/t/fast_update_decr_floor.test | 409 +- .../tokudb/t/fast_update_disable_slow_update.test | 17 - .../mysql-test/tokudb/t/fast_update_error.test | 16 +- .../tokudb/mysql-test/tokudb/t/fast_update_int.py | 77 - .../mysql-test/tokudb/t/fast_update_int.test | 682 +- .../tokudb/t/fast_update_int_bounds.test | 55 +- .../mysql-test/tokudb/t/fast_update_key.test | 63 +- .../mysql-test/tokudb/t/fast_update_sqlmode.test | 25 +- .../tokudb/t/fast_update_uint_bounds.test | 42 +- .../mysql-test/tokudb/t/fast_update_varchar.py | 63 - .../mysql-test/tokudb/t/fast_update_varchar.test | 7390 +--- .../mysql-test/tokudb/t/fast_upsert_bin_pad.test | 19 +- .../mysql-test/tokudb/t/fast_upsert_char.test | 27 +- .../mysql-test/tokudb/t/fast_upsert_deadlock.test | 22 +- .../tokudb/mysql-test/tokudb/t/fast_upsert_int.py | 50 - .../mysql-test/tokudb/t/fast_upsert_int.test | 486 +- .../mysql-test/tokudb/t/fast_upsert_key.test | 46 +- .../mysql-test/tokudb/t/fast_upsert_sqlmode.test | 27 +- .../mysql-test/tokudb/t/fast_upsert_values.test | 21 +- storage/tokudb/mysql-test/tokudb/t/tokudb_mrr.test | 73 + .../tokudb/mysql-test/tokudb_bugs/r/PS-3773.result | 8 + .../r/alter_table_comment_rebuild_data.result | 177 + .../tokudb/mysql-test/tokudb_bugs/t/PS-3773.test | 26 + .../t/alter_table_comment_rebuild_data.test | 188 + storage/tokudb/tokudb_debug.h | 5 - storage/tokudb/tokudb_dir_cmd.h | 6 +- storage/tokudb/tokudb_information_schema.cc | 74 +- storage/tokudb/tokudb_sysvars.cc | 122 +- storage/tokudb/tokudb_sysvars.h | 16 +- storage/tokudb/tokudb_thread.h | 26 +- storage/tokudb/tokudb_update_fun.cc | 230 +- storage/xtradb/CMakeLists.txt | 10 +- storage/xtradb/buf/buf0buf.cc | 16 +- storage/xtradb/buf/buf0dump.cc | 5 +- storage/xtradb/buf/buf0lru.cc | 2 +- storage/xtradb/dict/dict0crea.cc | 17 +- storage/xtradb/dict/dict0dict.cc | 7 +- storage/xtradb/fts/fts0ast.cc | 9 +- storage/xtradb/fts/fts0blex.cc | 30 +- storage/xtradb/fts/fts0fts.cc | 24 +- storage/xtradb/fts/fts0pars.cc | 20 +- storage/xtradb/fts/fts0pars.y | 20 +- storage/xtradb/fts/fts0que.cc | 23 +- storage/xtradb/fts/fts0tlex.cc | 30 +- storage/xtradb/handler/ha_innodb.cc | 105 +- storage/xtradb/handler/ha_innodb.h | 2 +- storage/xtradb/handler/handler0alter.cc | 20 +- storage/xtradb/include/buf0buf.h | 1 + storage/xtradb/include/data0type.ic | 1 - storage/xtradb/include/dict0mem.h | 6 +- storage/xtradb/include/fts0ast.h | 5 +- storage/xtradb/include/fts0fts.h | 2 +- storage/xtradb/include/fts0types.h | 4 +- storage/xtradb/include/os0proc.h | 3 +- storage/xtradb/include/row0ftsort.h | 9 + storage/xtradb/include/univ.i | 2 +- storage/xtradb/log/log0online.cc | 4 +- storage/xtradb/os/os0proc.cc | 63 +- storage/xtradb/pars/lexyy.cc | 30 +- storage/xtradb/row/row0ftsort.cc | 1 - storage/xtradb/row/row0import.cc | 12 +- storage/xtradb/row/row0log.cc | 2 +- storage/xtradb/row/row0merge.cc | 13 +- storage/xtradb/row/row0mysql.cc | 180 +- storage/xtradb/row/row0sel.cc | 5 +- storage/xtradb/srv/srv0conc.cc | 1 + storage/xtradb/srv/srv0srv.cc | 1 - storage/xtradb/srv/srv0start.cc | 3 +- storage/xtradb/trx/trx0purge.cc | 2 +- storage/xtradb/trx/trx0trx.cc | 2 +- strings/ctype-uca.c | 116 +- strings/ctype-utf8.c | 46 +- 406 files changed, 7200 insertions(+), 195812 deletions(-) diff --cc mysql-test/t/alter_table.test index 9703b9a1455,aea1a880a81..30300efb34e --- a/mysql-test/t/alter_table.test +++ b/mysql-test/t/alter_table.test @@@ -1300,51 -1300,101 +1300,98 @@@ DROP TABLE t1 --echo # BUG#27788685: NO WARNING WHEN TRUNCATING A STRING WITH DATA LOSS --echo # + SET GLOBAL max_allowed_packet=17825792; + + --connect(con1, localhost, root,,) + CREATE TABLE t1 (t1_fld1 TEXT); + CREATE TABLE t2 (t2_fld1 MEDIUMTEXT); + CREATE TABLE t3 (t3_fld1 LONGTEXT); + + INSERT INTO t1 VALUES (REPEAT('a',300)); + INSERT INTO t2 VALUES (REPEAT('b',65680)); + INSERT INTO t3 VALUES (REPEAT('c',16777300)); + + SELECT LENGTH(t1_fld1) FROM t1; + SELECT LENGTH(t2_fld1) FROM t2; + SELECT LENGTH(t3_fld1) FROM t3; + + --echo # With strict mode + SET SQL_MODE='STRICT_ALL_TABLES'; + + --error ER_DATA_TOO_LONG + ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT; + --error ER_DATA_TOO_LONG + ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT; + --error ER_DATA_TOO_LONG + ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT; + + --echo # With non-strict mode + SET SQL_MODE=''; + + ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT; + ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT; + ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT; + + SELECT LENGTH(my_t1_fld1) FROM t1; + SELECT LENGTH(my_t2_fld1) FROM t2; + SELECT LENGTH(my_t3_fld1) FROM t3; + + # Cleanup + --disconnect con1 + --source include/wait_until_disconnected.inc + + --connection default + DROP TABLE t1, t2, t3; + + SET SQL_MODE=default; + SET GLOBAL max_allowed_packet=default; + -# -# Test of ALTER TABLE IF [NOT] EXISTS -# + -CREATE TABLE t1 ( - id INT(11) NOT NULL, - x_param INT(11) DEFAULT NULL, - PRIMARY KEY (id) -) ENGINE=MYISAM; +SET GLOBAL max_allowed_packet=17825792; + +--connect(con1, localhost, root,,) +CREATE TABLE t1 (t1_fld1 TEXT); +CREATE TABLE t2 (t2_fld1 MEDIUMTEXT); +CREATE TABLE t3 (t3_fld1 LONGTEXT); -ALTER TABLE t1 ADD COLUMN IF NOT EXISTS id INT, - ADD COLUMN IF NOT EXISTS lol INT AFTER id; -ALTER TABLE t1 ADD COLUMN IF NOT EXISTS lol INT AFTER id; -ALTER TABLE t1 DROP COLUMN IF EXISTS lol; -ALTER TABLE t1 DROP COLUMN IF EXISTS lol; +INSERT INTO t1 VALUES (REPEAT('a',300)); +INSERT INTO t2 VALUES (REPEAT('b',65680)); +INSERT INTO t3 VALUES (REPEAT('c',16777300)); -ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); -ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); -ALTER TABLE t1 MODIFY IF EXISTS lol INT; +SELECT LENGTH(t1_fld1) FROM t1; +SELECT LENGTH(t2_fld1) FROM t2; +SELECT LENGTH(t3_fld1) FROM t3; -DROP INDEX IF EXISTS x_param ON t1; -DROP INDEX IF EXISTS x_param ON t1; -CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); -CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); -SHOW CREATE TABLE t1; -DROP TABLE t1; +--echo # With strict mode +SET SQL_MODE='STRICT_ALL_TABLES'; -CREATE TABLE t1 ( - id INT(11) NOT NULL, - x_param INT(11) DEFAULT NULL, - PRIMARY KEY (id) -) ENGINE=INNODB; +--error ER_DATA_TOO_LONG +ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT; +--error ER_DATA_TOO_LONG +ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT; +--error ER_DATA_TOO_LONG +ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT; + +--echo # With non-strict mode +SET SQL_MODE=''; + +ALTER TABLE t1 CHANGE `t1_fld1` `my_t1_fld1` TINYTEXT; +ALTER TABLE t2 CHANGE `t2_fld1` `my_t2_fld1` TEXT; +ALTER TABLE t3 CHANGE `t3_fld1` `my_t3_fld1` MEDIUMTEXT; -CREATE TABLE t2 ( - id INT(11) NOT NULL) ENGINE=INNODB; +SELECT LENGTH(my_t1_fld1) FROM t1; +SELECT LENGTH(my_t2_fld1) FROM t2; +SELECT LENGTH(my_t3_fld1) FROM t3; -ALTER TABLE t1 ADD COLUMN IF NOT EXISTS id INT, - ADD COLUMN IF NOT EXISTS lol INT AFTER id; -ALTER TABLE t1 ADD COLUMN IF NOT EXISTS lol INT AFTER id; -ALTER TABLE t1 DROP COLUMN IF EXISTS lol; -ALTER TABLE t1 DROP COLUMN IF EXISTS lol; +# Cleanup +--disconnect con1 +--source include/wait_until_disconnected.inc -ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); -ALTER TABLE t1 ADD KEY IF NOT EXISTS x_param(x_param); -ALTER TABLE t1 MODIFY IF EXISTS lol INT; +--connection default +DROP TABLE t1, t2, t3; -DROP INDEX IF EXISTS x_param ON t1; -DROP INDEX IF EXISTS x_param ON t1; -CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); +SET SQL_MODE=default; +SET GLOBAL max_allowed_packet=default; CREATE INDEX IF NOT EXISTS x_param1 ON t1(x_param); SHOW CREATE TABLE t1; diff --cc mysql-test/t/type_float.test index 297860f1e05,5dfb4a75bb3..ebed9550afe --- a/mysql-test/t/type_float.test +++ b/mysql-test/t/type_float.test @@@ -333,33 -333,63 +333,62 @@@ eval select concat((truncate((-1.797693 select format(truncate('1.7976931348623157E+308',-12),1,'fr_BE') as foo; + --echo # + --echo # MDEV-17249 MAKETIME(-1e50,0,0) returns a wrong result + --echo # + + SELECT LEFT('a',EXP(50)); + SELECT LEFT('a', COALESCE(1e30)); + + CREATE TABLE t1 (a FLOAT); + INSERT INTO t1 VALUES (1e30); + SELECT LEFT('a',a), LEFT('a',1e30) FROM t1; + DROP TABLE t1; + + PREPARE stmt FROM 'SELECT LEFT(111,?)'; + SET @a=1e30; + EXECUTE stmt USING @a; + DEALLOCATE PREPARE stmt; + + CREATE TABLE t1 (a INT); + INSERT INTO t1 VALUES (1),(2),(3); + SELECT LEFT('a',(SELECT 1e30 FROM t1 LIMIT 1)); + DROP TABLE t1; + + CREATE TABLE t1 (a DOUBLE); + INSERT INTO t1 VALUES (1e30),(0); + SELECT LEFT('a', SUM(a)) FROM t1; + SELECT LEFT('a', AVG(a)) FROM t1; + DROP TABLE t1; + + --echo # ---echo # Bug #13500371 63704: CONVERSION OF '1.' TO A NUMBER GIVES ERROR 1265 ---echo # (WARN_DATA_TRUNCATED) +--echo # MDEV-17249 MAKETIME(-1e50,0,0) returns a wrong result --echo # -CREATE TABLE t1 (f FLOAT); -INSERT INTO t1 VALUES ('1.'); -INSERT INTO t1 VALUES ('2.0.'); -INSERT INTO t1 VALUES ('.'); -SELECT * FROM t1 ORDER BY f; +SELECT LEFT('a',EXP(50)); +SELECT LEFT('a', COALESCE(1e30)); + +CREATE TABLE t1 (a FLOAT); +INSERT INTO t1 VALUES (1e30); +SELECT LEFT('a',a), LEFT('a',1e30) FROM t1; DROP TABLE t1; +PREPARE stmt FROM 'SELECT LEFT(111,?)'; +SET @a=1e30; +EXECUTE stmt USING @a; +DEALLOCATE PREPARE stmt; ---echo # ---echo # Start of 10.0 tests ---echo # +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1),(2),(3); +SELECT LEFT('a',(SELECT 1e30 FROM t1 LIMIT 1)); +DROP TABLE t1; ---echo # ---echo # MDEV-6950 Bad results with joins comparing DATE/DATETIME and INT/DECIMAL/DOUBLE/ENUM/VARCHAR columns ---echo # -CREATE TABLE t1 (a DATETIME PRIMARY KEY); -INSERT INTO t1 VALUES ('1999-01-01 00:00:00'); -CREATE TABLE t2 (a DOUBLE); -INSERT INTO t2 VALUES (19990101000000); -INSERT INTO t2 VALUES (990101000000); -SELECT t1.* FROM t1,t2 WHERE t1.a=t2.a; -SELECT t1.* FROM t1 LEFT JOIN t2 ON t1.a=t2.a; -ALTER TABLE t2 ADD PRIMARY KEY(a); +CREATE TABLE t1 (a DOUBLE); +INSERT INTO t1 VALUES (1e30),(0); +SELECT LEFT('a', SUM(a)) FROM t1; +SELECT LEFT('a', AVG(a)) FROM t1; +DROP TABLE t1; SELECT t1.* FROM t1,t2 WHERE t1.a=t2.a; SELECT t1.* FROM t1 LEFT JOIN t2 ON t1.a=t2.a; --echo # t2 should NOT be eliminated diff --cc sql/mysqld.cc index ab58928273a,21bfc3cead2..6194f539674 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@@ -1774,35 -1699,15 +1774,42 @@@ static void close_connections(void tmp->thread_id, (tmp->main_security_ctx.user ? tmp->main_security_ctx.user : "")); + /* + close_connection() might need a valid current_thd + for memory allocation tracking. + */ + THD* save_thd= current_thd; + set_current_thd(tmp); close_connection(tmp,ER_SERVER_SHUTDOWN); + set_current_thd(save_thd); } +#endif +#ifdef WITH_WSREP + /* + * TODO: this code block may turn out redundant. wsrep->disconnect() + * should terminate slave threads gracefully, and we don't need + * to signal them here. + * The code here makes sure mysqld will not hang during shutdown + * even if wsrep provider has problems in shutting down. + */ + if (WSREP(tmp) && tmp->wsrep_exec_mode==REPL_RECV) + { + sql_print_information("closing wsrep system thread"); + tmp->killed= KILL_CONNECTION; + MYSQL_CALLBACK(thread_scheduler, post_kill_notification, (tmp)); + if (tmp->mysys_var) + { + tmp->mysys_var->abort=1; + mysql_mutex_lock(&tmp->mysys_var->mutex); + if (tmp->mysys_var->current_cond) + { + mysql_mutex_lock(tmp->mysys_var->current_mutex); + mysql_cond_broadcast(tmp->mysys_var->current_cond); + mysql_mutex_unlock(tmp->mysys_var->current_mutex); + } + mysql_mutex_unlock(&tmp->mysys_var->mutex); + } + } #endif DBUG_PRINT("quit",("Unlocking LOCK_thread_count")); mysql_mutex_unlock(&LOCK_thread_count); diff --cc storage/tokudb/ha_tokudb.h index 9cf0c10e836,e322c3de18e..1831a71d1d5 --- a/storage/tokudb/ha_tokudb.h +++ b/storage/tokudb/ha_tokudb.h @@@ -1034,23 -1029,35 +1029,40 @@@ private void close_dsmrr(); void reset_dsmrr(); - #if TOKU_INCLUDE_WRITE_FRM_DATA + #if defined(TOKU_INCLUDE_WRITE_FRM_DATA) && TOKU_INCLUDE_WRITE_FRM_DATA int write_frm_data(const uchar *frm_data, size_t frm_len); - #endif - #if TOKU_INCLUDE_UPSERT - private: - int fast_update(THD *thd, List<Item> &update_fields, List<Item> &update_values, Item *conds); - bool check_fast_update(THD *thd, List<Item> &update_fields, List<Item> &update_values, Item *conds); - int send_update_message(List<Item> &update_fields, List<Item> &update_values, Item *conds, DB_TXN *txn); - int upsert(THD *thd, List<Item> &update_fields, List<Item> &update_values); - bool check_upsert(THD *thd, List<Item> &update_fields, List<Item> &update_values); - int send_upsert_message(THD *thd, List<Item> &update_fields, List<Item> &update_values, DB_TXN *txn); - #endif + #endif // defined(TOKU_INCLUDE_WRITE_FRM_DATA) && TOKU_INCLUDE_WRITE_FRM_DATA + +#ifdef WITH_WSREP - int wsrep_append_keys(THD *thd, bool shared, - const uchar* record0, const uchar* record1); ++ int wsrep_append_keys(THD *thd, bool shared, ++ const uchar* record0, const uchar* record1); +#endif + + private: + #if defined(TOKU_INCLUDE_UPSERT) && TOKU_INCLUDE_UPSERT + MY_NODISCARD int fast_update(THD *thd, + List<Item> &update_fields, + List<Item> &update_values, + Item *conds); + MY_NODISCARD bool check_fast_update(THD *thd, + List<Item> &update_fields, + List<Item> &update_values, + Item *conds); + MY_NODISCARD int send_update_message(List<Item> &update_fields, + List<Item> &update_values, + Item *conds, + DB_TXN *txn); + MY_NODISCARD int upsert(THD *thd, + List<Item> &update_fields, + List<Item> &update_values); + MY_NODISCARD bool check_upsert(THD *thd, + List<Item> &update_fields, + List<Item> &update_values); + MY_NODISCARD int send_upsert_message(List<Item> &update_fields, + List<Item> &update_values, + DB_TXN *txn); + #endif // defined(TOKU_INCLUDE_UPSERT) && TOKU_INCLUDE_UPSERT + public: // mysql sometimes retires a txn before a cursor that references the txn is closed. // for example, commit is sometimes called before index_end. the following methods diff --cc storage/xtradb/include/data0type.ic index a7e2eb0682c,63a0785744d..c55ec38ad43 --- a/storage/xtradb/include/data0type.ic +++ b/storage/xtradb/include/data0type.ic @@@ -603,7 -603,7 +603,6 @@@ dtype_get_min_size_low return(0); } #endif /* UNIV_DEBUG */ - /* fall through */ - // fallthrough case DATA_CHAR: case DATA_FIXBINARY: case DATA_INT: diff --cc storage/xtradb/srv/srv0srv.cc index 0c4f6f622e0,2200d9bc68f..515f7c46485 --- a/storage/xtradb/srv/srv0srv.cc +++ b/storage/xtradb/srv/srv0srv.cc @@@ -166,10 -158,7 +166,9 @@@ use simulated aio we build below with t Currently we support native aio on windows and linux */ /* make srv_use_native_aio to be visible for other plugins */ my_bool srv_use_native_aio = TRUE; - UNIV_INTERN my_bool srv_numa_interleave = FALSE; +UNIV_INTERN my_bool srv_lock_timeout_active = FALSE; + #ifdef __WIN__ /* Windows native condition variables. We use runtime loading / function pointers, because they are not available on Windows Server 2003 and

1 0

[Commits] f95616dc477: MDEV-17401: LOAD DATA from very big file into MyISAM table results in EOF error and corrupt index
by Oleksandr Byelkin 30 Oct '18

30 Oct '18

revision-id: f95616dc4774328381044b53263d6a23ae19bfb4 (mariadb-5.5.61-39-gf95616dc477) parent(s): 893ebb739e24637985892da1555f2e6f1a8ac5b6 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-10-30 19:36:17 +0100 message: MDEV-17401: LOAD DATA from very big file into MyISAM table results in EOF error and corrupt index my_read fixed as in higher versions. my_pread made as my_read aware of partial read of huge chunks of files MY_FULL_IO enabled for file operations --- mysys/mf_iocache.c | 4 ++++ mysys/my_pread.c | 26 +++++++++++++++++++------- mysys/my_read.c | 52 ++++++++++++++++++++++++++++------------------------ 3 files changed, 51 insertions(+), 31 deletions(-) diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c index bd71e2ae527..9a051cf6a9e 100644 --- a/mysys/mf_iocache.c +++ b/mysys/mf_iocache.c @@ -282,6 +282,10 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize, } info->inited=info->aio_result.pending=0; #endif + if (type == READ_CACHE || type == WRITE_CACHE || type == SEQ_READ_APPEND) + info->myflags|= MY_FULL_IO; + else + info->myflags&= ~MY_FULL_IO; DBUG_RETURN(0); } /* init_io_cache */ diff --git a/mysys/my_pread.c b/mysys/my_pread.c index 51b4c5f5599..52d5c382960 100644 --- a/mysys/my_pread.c +++ b/mysys/my_pread.c @@ -47,8 +47,7 @@ size_t my_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset, myf MyFlags) { - size_t readbytes; - int error= 0; + size_t readbytes, save_count= 0; DBUG_ENTER("my_pread"); @@ -66,11 +65,10 @@ size_t my_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset, #else readbytes= pread(Filedes, Buffer, Count, offset); #endif - error = (readbytes != Count); - if (error) + if (readbytes != Count) { - my_errno= errno ? errno : -1; + my_errno= errno; if (errno == 0 || (readbytes != (size_t) -1 && (MyFlags & (MY_NABP | MY_FNABP)))) my_errno= HA_ERR_FILE_TOO_SHORT; @@ -82,6 +80,18 @@ size_t my_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset, (int) readbytes)); continue; /* Interrupted */ } + + /* Do a read retry if we didn't get enough data on first read */ + if (readbytes != (size_t) -1 && readbytes != 0 && + (MyFlags & MY_FULL_IO)) + { + Buffer+= readbytes; + Count-= readbytes; + save_count+= readbytes; + offset+= readbytes; + continue; + } + if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { if (readbytes == (size_t) -1) @@ -97,8 +107,10 @@ size_t my_pread(File Filedes, uchar *Buffer, size_t Count, my_off_t offset, DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ } if (MyFlags & (MY_NABP | MY_FNABP)) - DBUG_RETURN(0); /* Read went ok; Return 0 */ - DBUG_RETURN(readbytes); /* purecov: inspected */ + readbytes= 0; /* Read went ok; Return 0 */ + else + readbytes+= save_count; + DBUG_RETURN(readbytes); } } /* my_pread */ diff --git a/mysys/my_read.c b/mysys/my_read.c index 883a1c5fdc7..47f2d725f65 100644 --- a/mysys/my_read.c +++ b/mysys/my_read.c @@ -35,17 +35,16 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags) { - size_t readbytes, save_count; + size_t readbytes, save_count= 0; DBUG_ENTER("my_read"); - DBUG_PRINT("my",("fd: %d Buffer: %p Count: %lu MyFlags: %d", - Filedes, Buffer, (ulong) Count, MyFlags)); - save_count= Count; + DBUG_PRINT("my",("fd: %d Buffer: %p Count: %lu MyFlags: %lu", + Filedes, Buffer, (ulong) Count, (ulong) MyFlags)); if (!(MyFlags & (MY_WME | MY_FAE | MY_FNABP))) MyFlags|= my_global_flags; for (;;) { - errno= 0; /* Linux, Windows don't reset this on EOF/success */ + errno= 0; /* Linux, Windows don't reset this on EOF/success */ #ifdef _WIN32 readbytes= my_win_read(Filedes, Buffer, Count); #else @@ -61,47 +60,52 @@ size_t my_read(File Filedes, uchar *Buffer, size_t Count, myf MyFlags) if (readbytes != Count) { - my_errno= errno; - if (errno == 0 || (readbytes != (size_t) -1 && - (MyFlags & (MY_NABP | MY_FNABP)))) - my_errno= HA_ERR_FILE_TOO_SHORT; + int got_errno= my_errno= errno; DBUG_PRINT("warning",("Read only %d bytes off %lu from %d, errno: %d", (int) readbytes, (ulong) Count, Filedes, - my_errno)); + got_errno)); + + if (got_errno == 0 || (readbytes != (size_t) -1 && + (MyFlags & (MY_NABP | MY_FNABP)))) + my_errno= HA_ERR_FILE_TOO_SHORT; - if ((readbytes == 0 || (int) readbytes == -1) && errno == EINTR) - { + if ((readbytes == 0 || (int) readbytes == -1) && got_errno == EINTR) + { DBUG_PRINT("debug", ("my_read() was interrupted and returned %ld", (long) readbytes)); continue; /* Interrupted */ } + /* Do a read retry if we didn't get enough data on first read */ + if (readbytes != (size_t) -1 && readbytes != 0 && + (MyFlags & MY_FULL_IO)) + { + Buffer+= readbytes; + Count-= readbytes; + save_count+= readbytes; + continue; + } + if (MyFlags & (MY_WME | MY_FAE | MY_FNABP)) { if (readbytes == (size_t) -1) my_error(EE_READ, MYF(ME_BELL | ME_WAITTANG | (MyFlags & (ME_JUST_INFO | ME_NOREFRESH))), - my_filename(Filedes),my_errno); + my_filename(Filedes), got_errno); else if (MyFlags & (MY_NABP | MY_FNABP)) my_error(EE_EOFERR, MYF(ME_BELL | ME_WAITTANG | (MyFlags & (ME_JUST_INFO | ME_NOREFRESH))), - my_filename(Filedes),my_errno); + my_filename(Filedes), got_errno); } if (readbytes == (size_t) -1 || ((MyFlags & (MY_FNABP | MY_NABP)) && !(MyFlags & MY_FULL_IO))) - DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ - if (readbytes != (size_t) -1 && (MyFlags & MY_FULL_IO)) - { - Buffer+= readbytes; - Count-= readbytes; - continue; - } + DBUG_RETURN(MY_FILE_ERROR); /* Return with error */ } if (MyFlags & (MY_NABP | MY_FNABP)) - readbytes= 0; /* Ok on read */ - else if (MyFlags & MY_FULL_IO) - readbytes= save_count; + readbytes= 0; /* Ok on read */ + else + readbytes+= save_count; break; } DBUG_RETURN(readbytes);

1 0