- commits - lists.mariadb.org

[Commits] 7a2dae8: Fixed a problem with LOAD DATA.
by IgorBabaev 08 Apr '18

08 Apr '18

revision-id: 7a2dae86f4595ed10cb72c34329e3c9be50f5504 (mariadb-10.3.5-115-g7a2dae8) parent(s): 2d82e5ccdc934c0d8530147984b410f3f63cbf1d author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-08 11:23:53 -0700 message: Fixed a problem with LOAD DATA. --- sql/sql_yacc.yy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 7fb0ee7..20b0a01 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -14794,8 +14794,9 @@ load: $2 == FILETYPE_CSV ? "LOAD DATA" : "LOAD XML"); MYSQL_YYABORT; } - if (Lex->main_select_push()) + if (lex->main_select_push()) MYSQL_YYABORT; + mysql_init_select(lex); } load_data_lock opt_local INFILE TEXT_STRING_filesystem {

1 0

[Commits] 5494abc: MDEV-15611 Due to the failure of foreign key detection, Galera...
by sachin 08 Apr '18

08 Apr '18

revision-id: 5494abcfb55e733a3fd4939d9d96b71e2a5dbc42 (mariadb-10.2.14-25-g5494abc) parent(s): bc2501453c3ab9a2cf3516bc3557de8665bc2776 author: Sachin Setiya committer: Sachin Setiya timestamp: 2018-04-08 22:25:37 +0530 message: MDEV-15611 Due to the failure of foreign key detection, Galera... slave node killed himself. Problem:- If we try to delete table with foreign key and table whom it is referring with wsrep_slave_threads>1 then galera tries to execute both Delete_rows_log-event in parallel, which should not happen. Solution:- This is happening because we do not have foreign key info in write set. Upto version 10.2.7 it used to work fine. Actually it happening because of issue in commit 2f342c4. wsrep_must_process_fk has changed to make it similar to original condition. --- mysql-test/suite/galera/r/galera_mdev_15611.result | 16 ++++++++++++ mysql-test/suite/galera/t/galera_mdev_15611.cnf | 5 ++++ mysql-test/suite/galera/t/galera_mdev_15611.test | 30 ++++++++++++++++++++++ storage/innobase/row/row0upd.cc | 18 ++++++------- 4 files changed, 59 insertions(+), 10 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_mdev_15611.result b/mysql-test/suite/galera/r/galera_mdev_15611.result new file mode 100644 index 0000000..9ea1684 --- /dev/null +++ b/mysql-test/suite/galera/r/galera_mdev_15611.result @@ -0,0 +1,16 @@ +connection node_1; +CREATE TABLE t1 ( +id int primary key +); +CREATE TABLE t2 ( +id int primary key , +f_id int DEFAULT NULL, FOREIGN KEY(f_id) REFERENCES t1 (id) +); +insert into t1 select 1; +#Running 200 insert in t2 table +select count(*) from t2; +count(*) +200 +delete from t2; +delete from t1; +drop table t2,t1; diff --git a/mysql-test/suite/galera/t/galera_mdev_15611.cnf b/mysql-test/suite/galera/t/galera_mdev_15611.cnf new file mode 100644 index 0000000..b6f601c --- /dev/null +++ b/mysql-test/suite/galera/t/galera_mdev_15611.cnf @@ -0,0 +1,5 @@ +!include ../galera_2nodes.cnf +[mysqld.1] + +[mysqld.2] +wsrep_slave_threads=6 diff --git a/mysql-test/suite/galera/t/galera_mdev_15611.test b/mysql-test/suite/galera/t/galera_mdev_15611.test new file mode 100644 index 0000000..d32d7e7 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_mdev_15611.test @@ -0,0 +1,30 @@ +--source include/galera_cluster.inc +--source include/have_innodb.inc + +--connection node_1 +CREATE TABLE t1 ( + id int primary key +); + +CREATE TABLE t2 ( + id int primary key , + f_id int DEFAULT NULL, FOREIGN KEY(f_id) REFERENCES t1 (id) +); + +insert into t1 select 1; + +--disable_query_log +--let $count=200 +--echo #Running 200 insert in t2 table +while($count) +{ + #Repeatedly execute the following SQL until you generate thousands of data + --eval insert into t2 values ($count, 1); + --dec $count +} +--enable_query_log + +select count(*) from t2; +delete from t2; +delete from t1; +drop table t2,t1; diff --git a/storage/innobase/row/row0upd.cc b/storage/innobase/row/row0upd.cc index 5009ac0..fd11638 100644 --- a/storage/innobase/row/row0upd.cc +++ b/storage/innobase/row/row0upd.cc @@ -466,17 +466,15 @@ wsrep_row_upd_check_foreign_constraints( @param[in] node query node @param[in] trx transaction @return whether the node cannot be ignored */ -inline -bool -wsrep_must_process_fk(const upd_node_t* node, const trx_t* trx) -{ - if (que_node_get_type(node->common.parent) != QUE_NODE_UPDATE - || !wsrep_on_trx(trx)) { - return false; - } - return static_cast<upd_node_t*>(node->common.parent)->cascade_node - == node; +inline bool wsrep_must_process_fk(const upd_node_t* node, const trx_t* trx) +{ + if (!wsrep_on_trx(trx)) { + return false; + } + return que_node_get_type(node->common.parent) != QUE_NODE_UPDATE + || static_cast<upd_node_t*>(node->common.parent)->cascade_node + != node; } #endif /* WITH_WSREP */

1 0

[Commits] 8bb40f24049: MDEV-13549: Galera test failures
by jan 08 Apr '18

08 Apr '18

revision-id: 8bb40f2404909fc9c8070008f8a6e86180f2d74b (mariadb-10.1.32-40-g8bb40f24049) parent(s): 1568950a7d0d4f184af6a8779d820d0100170529 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-08 13:04:38 +0300 message: MDEV-13549: Galera test failures Disable more occasionally failing test cases. galera.galera_lock_table galera.galera_gra_log galera.MW-44 galera.lp1376747 galera.lp1376747-2 galera.galera_pc_ignore_sb --- mysql-test/suite/galera/disabled.def | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index cfee87d9686..13bb2d01ffb 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -31,3 +31,10 @@ galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on pxc-421 : MDEV-15804 Test failure on galera.pxc-421 query_cache : MDEV-15805 Test failure on galera.query_cache +galera.galera_lock_table : MDEV-15807 +galera.galera_gra_log : MDEV-15808 Test failure on galera.galera_gra_log +galera.MW-44 : MDEV-15809 Test failure on galera.MW-44 +galera.lp1376747 : MDEV-15810 Test failure on galera.lp1376747 +galera.lp1376747-2 : MDEV-15810 Test failure on galera.lp1376747-2 +galera.galera_pc_ignore_sb : MDEV-15811 Test failure on galera_pc_ignore_sb +

1 0

[Commits] 2d82e5c: Adjusted some tests
by IgorBabaev 08 Apr '18

08 Apr '18

revision-id: 2d82e5ccdc934c0d8530147984b410f3f63cbf1d (mariadb-10.3.5-114-g2d82e5c) parent(s): f3958957075f1d0b9740774777341e8b2cdfd7f4 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-07 23:28:44 -0700 message: Adjusted some tests --- mysql-test/suite/funcs_1/r/innodb_views.result | 2 +- mysql-test/suite/funcs_1/views/views_master.inc | 2 +- mysql-test/suite/innodb/r/innodb.result | 2 +- mysql-test/suite/innodb/t/innodb.test | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/suite/funcs_1/r/innodb_views.result b/mysql-test/suite/funcs_1/r/innodb_views.result index b00d1a5..bf523d4 100644 --- a/mysql-test/suite/funcs_1/r/innodb_views.result +++ b/mysql-test/suite/funcs_1/r/innodb_views.result @@ -3497,7 +3497,7 @@ DROP VIEW IF EXISTS v2 ; CREATE TABLE t1 (f1 BIGINT) ; SET @x=0; CREATE or REPLACE VIEW v1 AS Select 1 INTO @x; -ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'INTO @x' at line 1 +ERROR 42000: Incorrect usage/placement of 'INTO' Select @x; @x 0 diff --git a/mysql-test/suite/funcs_1/views/views_master.inc b/mysql-test/suite/funcs_1/views/views_master.inc index 17f5c1e..e4b5811 100644 --- a/mysql-test/suite/funcs_1/views/views_master.inc +++ b/mysql-test/suite/funcs_1/views/views_master.inc @@ -266,7 +266,7 @@ CREATE TABLE t1 (f1 BIGINT) ; # SELECT INTO is illegal SET @x=0; ---error ER_PARSE_ERROR +--error ER_CANT_USE_OPTION_HERE CREATE or REPLACE VIEW v1 AS Select 1 INTO @x; Select @x; diff --git a/mysql-test/suite/innodb/r/innodb.result b/mysql-test/suite/innodb/r/innodb.result index aafd31a..005fd70 100644 --- a/mysql-test/suite/innodb/r/innodb.result +++ b/mysql-test/suite/innodb/r/innodb.result @@ -1608,7 +1608,7 @@ INSERT INTO t1 VALUES (1),(2),(3); CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL default '0', PRIMARY KEY (b_id), KEY (b_a), CONSTRAINT fk_b_a FOREIGN KEY (b_a) REFERENCES t1 (a_id) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=InnoDB DEFAULT CHARSET=latin1; INSERT INTO t2 VALUES (1,1),(2,1),(3,1),(4,2),(5,2); -SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN (t2) on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz; +SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN t2 on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz; a_id b_list 1 1,2,3 2 4,5 diff --git a/mysql-test/suite/innodb/t/innodb.test b/mysql-test/suite/innodb/t/innodb.test index 472b478..dd8a67e 100644 --- a/mysql-test/suite/innodb/t/innodb.test +++ b/mysql-test/suite/innodb/t/innodb.test @@ -1253,7 +1253,7 @@ CREATE TABLE t2 (b_id tinyint(4) NOT NULL default '0',b_a tinyint(4) NOT NULL de CONSTRAINT fk_b_a FOREIGN KEY (b_a) REFERENCES t1 (a_id) ON DELETE CASCADE ON UPDATE NO ACTION) ENGINE=InnoDB DEFAULT CHARSET=latin1; --enable_warnings INSERT INTO t2 VALUES (1,1),(2,1),(3,1),(4,2),(5,2); -SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN (t2) on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz; +SELECT * FROM (SELECT t1.*,GROUP_CONCAT(t2.b_id SEPARATOR ',') as b_list FROM (t1 LEFT JOIN t2 on t1.a_id = t2.b_a) GROUP BY t1.a_id ) AS xyz; DROP TABLE t2; DROP TABLE t1;

1 0

[Commits] 1568950a7d0: MDEV-15806: Test failure on galera.galera_parallel_simple
by jan 08 Apr '18

08 Apr '18

revision-id: 1568950a7d0d4f184af6a8779d820d0100170529 (mariadb-10.1.32-39-g1568950a7d0) parent(s): c4b1a57b131e767955aaf85170039977200c050d author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-08 09:03:55 +0300 message: MDEV-15806: Test failure on galera.galera_parallel_simple Make sure DDL's (create tables) are replicated before continuing to lock table. --- mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/galera_parallel_simple.result | 4 ++++ mysql-test/suite/galera/t/galera_parallel_simple.test | 7 +++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 3388d2328ca..cfee87d9686 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -31,4 +31,3 @@ galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on pxc-421 : MDEV-15804 Test failure on galera.pxc-421 query_cache : MDEV-15805 Test failure on galera.query_cache -galera_parallel_simple : MDEV-15806 Test failure on galera.galera_parallel_simple \ No newline at end of file diff --git a/mysql-test/suite/galera/r/galera_parallel_simple.result b/mysql-test/suite/galera/r/galera_parallel_simple.result index 3b10815c63d..0b19ef7da8f 100644 --- a/mysql-test/suite/galera/r/galera_parallel_simple.result +++ b/mysql-test/suite/galera/r/galera_parallel_simple.result @@ -1,6 +1,10 @@ CREATE TABLE t1 (id INT) ENGINE=InnoDB; CREATE TABLE t2 (id INT) ENGINE=InnoDB; SET GLOBAL wsrep_slave_threads = 2; +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +NAME +test/t1 +test/t2 LOCK TABLE t1 WRITE; INSERT INTO t1 VALUES (1); INSERT INTO t2 VALUES (1); diff --git a/mysql-test/suite/galera/t/galera_parallel_simple.test b/mysql-test/suite/galera/t/galera_parallel_simple.test index 41cd0c8e6fa..2cd840123cf 100644 --- a/mysql-test/suite/galera/t/galera_parallel_simple.test +++ b/mysql-test/suite/galera/t/galera_parallel_simple.test @@ -13,6 +13,13 @@ CREATE TABLE t2 (id INT) ENGINE=InnoDB; --connection node_2 SET GLOBAL wsrep_slave_threads = 2; + +# Wait until above DDL's are replicated +--let $wait_condition = SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; +--source include/wait_condition.inc + +SELECT NAME FROM INFORMATION_SCHEMA.INNODB_SYS_TABLES WHERE NAME LIKE 'test/t%'; + LOCK TABLE t1 WRITE; --connection node_1

1 0

[Commits] c4b1a57b131: MDEV-13549: Galera test failures
by jan 08 Apr '18

08 Apr '18

revision-id: c4b1a57b131e767955aaf85170039977200c050d (mariadb-10.1.32-38-gc4b1a57b131) parent(s): d9c85ee45a5b33ff823d8db1261d21426e89dfb0 author: Jan Lindström committer: Jan Lindström timestamp: 2018-04-08 08:24:36 +0300 message: MDEV-13549: Galera test failures Disable occasionally failing test cases pxc-421 query_cache galera_parallel_simple --- mysql-test/suite/galera/disabled.def | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 105c5a0cbbe..3388d2328ca 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -27,6 +27,8 @@ galera_ist_mysqldump : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures galera.MW-329 : wsrep_local_replays not stable galera.MW-328A : have_deadlocks test not stable -galera_var_retry_autocommit: MDEV-15794 Test failure on galera.galera_var_retry_autocommit -galera_var_auto_inc_control_on: MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on - +galera_var_retry_autocommit : MDEV-15794 Test failure on galera.galera_var_retry_autocommit +galera_var_auto_inc_control_on : MDEV-15803 Test failure on galera.galera_var_auto_inc_control_on +pxc-421 : MDEV-15804 Test failure on galera.pxc-421 +query_cache : MDEV-15805 Test failure on galera.query_cache +galera_parallel_simple : MDEV-15806 Test failure on galera.galera_parallel_simple \ No newline at end of file

1 0

[Commits] f395895: Applied code from the fix for the bug MDEV-15738 to get rid
by IgorBabaev 08 Apr '18

08 Apr '18

revision-id: f3958957075f1d0b9740774777341e8b2cdfd7f4 (mariadb-10.3.5-113-gf395895) parent(s): b19cf47ce0b1659a0ad91fe1ed5c22df0bc47969 author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-07 18:47:49 -0700 message: Applied code from the fix for the bug MDEV-15738 to get rid of a failure in main.information_schema in --ps-protocol. --- sql/item.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sql/item.cc b/sql/item.cc index d74e5aa..8b11fb2 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -3082,8 +3082,8 @@ Item_field::Item_field(THD *thd, Field *f) field_name and table_name should not point to garbage if this item is to be reused */ - orig_table_name= ""; - orig_field_name= null_clex_str; + orig_table_name= table_name; + orig_field_name= field_name; with_field= 1; }

1 0

[Commits] b19cf47: Fixed problems of INSERTs for prepared statements.
by IgorBabaev 07 Apr '18

07 Apr '18

revision-id: b19cf47ce0b1659a0ad91fe1ed5c22df0bc47969 (mariadb-10.3.5-112-gb19cf47) parent(s): b1f765d14b3bd0e3e2dbc874293dad77d5ad791c author: Igor Babaev committer: Igor Babaev timestamp: 2018-04-07 13:45:49 -0700 message: Fixed problems of INSERTs for prepared statements. --- sql/sql_lex.cc | 66 +++++++++++++++++++++++++++++---------------------------- sql/sql_lex.h | 2 ++ sql/sql_yacc.yy | 3 ++- 3 files changed, 38 insertions(+), 33 deletions(-) diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc index 2765a46..75059bc 100644 --- a/sql/sql_lex.cc +++ b/sql/sql_lex.cc @@ -8480,51 +8480,53 @@ bool LEX::insert_select_hack(SELECT_LEX *sel) DBUG_ASSERT(first_select_lex() == &builtin_select); DBUG_ASSERT(sel != NULL); - if (builtin_select.first_inner_unit()) - { - sel->link_chain_down(builtin_select.first_inner_unit()); - builtin_select.slave= NULL; - } - - if (builtin_select.link_prev) - { - if ((*builtin_select.link_prev= builtin_select.link_next)) - ((st_select_lex *)builtin_select.link_next)->link_prev= - builtin_select.link_prev; - builtin_select.link_prev= NULL; // indicator of removal - } - - set_main_unit(sel->master_unit()); - - DBUG_ASSERT(builtin_select.table_list.elements == 1); - TABLE_LIST *insert_table= builtin_select.table_list.first; - - if (!(insert_table->next_local= sel->table_list.first)) - { - sel->table_list.next= &insert_table->next_local; - } - sel->table_list.first= insert_table; - sel->table_list.elements++; - insert_table->select_lex= sel; - - sel->context.first_name_resolution_table= insert_table; - builtin_select.context= sel->context; - change_item_list_context(&field_list, &sel->context); - if (sel->tvc && !sel->next_select() && (sql_command == SQLCOM_INSERT_SELECT || sql_command == SQLCOM_REPLACE_SELECT)) { - DBUG_PRINT("info", ("'Unual' INSERT detected")); + DBUG_PRINT("info", ("'Usual' INSERT detected")); many_values= sel->tvc->lists_of_values; sel->options= sel->tvc->select_options; sel->tvc= NULL; + // sel->fast_exclude(); if (sql_command == SQLCOM_INSERT_SELECT) sql_command= SQLCOM_INSERT; else sql_command= SQLCOM_REPLACE; } + else + { + if (builtin_select.first_inner_unit()) + { + sel->link_chain_down(builtin_select.first_inner_unit()); + builtin_select.slave= NULL; + } + + if (builtin_select.link_prev) + { + if ((*builtin_select.link_prev= builtin_select.link_next)) + ((st_select_lex *)builtin_select.link_next)->link_prev= + builtin_select.link_prev; + builtin_select.link_prev= NULL; // indicator of removal + } + set_main_unit(sel->master_unit()); + + DBUG_ASSERT(builtin_select.table_list.elements == 1); + TABLE_LIST *insert_table= builtin_select.table_list.first; + + if (!(insert_table->next_local= sel->table_list.first)) + { + sel->table_list.next= &insert_table->next_local; + } + sel->table_list.first= insert_table; + sel->table_list.elements++; + insert_table->select_lex= sel; + + sel->context.first_name_resolution_table= insert_table; + builtin_select.context= sel->context; + change_item_list_context(&field_list, &sel->context); + } for (SELECT_LEX *sel= all_selects_list; sel; diff --git a/sql/sql_lex.h b/sql/sql_lex.h index 724559a..4049ac8 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -3120,6 +3120,8 @@ struct LEX: public Query_tables_list /* System Versioning */ vers_select_conds_t vers_conditions; + st_select_lex *tvc_select; + inline void free_set_stmt_mem_root() { DBUG_ASSERT(!is_arena_for_set_stmt()); diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 9372269..7fb0ee7 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -9245,11 +9245,12 @@ table_value_constructor: MYSQL_YYABORT; sel->init_select(); sel->braces= FALSE; // just initialisation + lex->tvc_select= lex->pop_select(); // above TVC select } values_list { LEX *lex=Lex; - $$= lex->pop_select(); // above TVC select + $$= lex->tvc_select; if (!($$->tvc= new (lex->thd->mem_root) table_value_constr(lex->many_values, $$,

1 0

[Commits] d6f3a00: MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB.
by holyfoot＠askmonty.org 07 Apr '18

07 Apr '18

revision-id: d6f3a0064be73cd134fd474e5ddc63646e09938a (mariadb-5.5.59-55-gd6f3a00) parent(s): 6beb08c7b67ed7610e95c0350f9f93005db1e055 committer: Alexey Botchkov timestamp: 2018-04-07 21:51:15 +0400 message: MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB. handler::ha_create_handler_files shouldn't call the mark_trx_read_write() for the temporary table. --- mysql-test/r/read_only_innodb.result | 8 ++++++++ mysql-test/t/read_only_innodb.test | 9 +++++++++ sql/handler.cc | 3 ++- 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/mysql-test/r/read_only_innodb.result b/mysql-test/r/read_only_innodb.result index 1e04139..2af72d3 100644 --- a/mysql-test/r/read_only_innodb.result +++ b/mysql-test/r/read_only_innodb.result @@ -221,6 +221,14 @@ a a 5 10 DROP TABLE temp1, temp2; +# MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB. + +CREATE TEMPORARY TABLE temp1 ENGINE=INNODB AS SELECT a FROM t1; +SELECT * FROM temp1; +a +1 +DROP TABLE temp1; + # Disconnect and cleanup SET GLOBAL READ_ONLY = OFF; diff --git a/mysql-test/t/read_only_innodb.test b/mysql-test/t/read_only_innodb.test index de237fe..f89cf74 100644 --- a/mysql-test/t/read_only_innodb.test +++ b/mysql-test/t/read_only_innodb.test @@ -244,6 +244,15 @@ SELECT * FROM temp1, temp2; DROP TABLE temp1, temp2; --echo +--echo # MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only and InnoDB. +--echo + +CREATE TEMPORARY TABLE temp1 ENGINE=INNODB AS SELECT a FROM t1; +SELECT * FROM temp1; +DROP TABLE temp1; + + +--echo --echo # Disconnect and cleanup --echo disconnect con1; diff --git a/sql/handler.cc b/sql/handler.cc index dc40e34..d8a9ac6 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3770,7 +3770,8 @@ int handler::ha_create_handler_files(const char *name, const char *old_name, int action_flag, HA_CREATE_INFO *info) { - mark_trx_read_write(); + if (!info || !(info->options & HA_LEX_CREATE_TMP_TABLE)) + mark_trx_read_write(); return create_handler_files(name, old_name, action_flag, info); }

1 0

[Commits] 6beb08c: MDEV-15624 Changing the default character set to utf8mb4 changes query evaluation in a very surprising way
by holyfoot＠askmonty.org 07 Apr '18

07 Apr '18

revision-id: 6beb08c7b67ed7610e95c0350f9f93005db1e055 (mariadb-5.5.59-54-g6beb08c) parent(s): f5369faf5bbfb56b5e945836eb3f7c7ee88b4079 committer: Alexander Barkov timestamp: 2018-04-04 09:12:44 +0400 message: MDEV-15624 Changing the default character set to utf8mb4 changes query evaluation in a very surprising way --- mysql-test/r/ctype_ucs.result | 31 +++++++++++++++++++++++++++++++ mysql-test/r/ctype_utf8mb4.result | 23 +++++++++++++++++++++++ mysql-test/t/ctype_ucs.test | 22 ++++++++++++++++++++++ mysql-test/t/ctype_utf8mb4.test | 19 +++++++++++++++++++ sql/item_func.h | 2 ++ sql/item_strfunc.h | 1 + 6 files changed, 98 insertions(+) diff --git a/mysql-test/r/ctype_ucs.result b/mysql-test/r/ctype_ucs.result index 1bbd3af..1c9e31d 100644 --- a/mysql-test/r/ctype_ucs.result +++ b/mysql-test/r/ctype_ucs.result @@ -4397,5 +4397,36 @@ Field Type Null Key Default Extra c1 mediumtext YES NULL DROP TABLE t1; # +# MDEV-15624 Changing the default character set to utf8mb4 changes query evaluation in a very surprising way +# +SET NAMES utf8; +CREATE TABLE t1 (id INT); +INSERT INTO t1 VALUES (1),(2),(3); +SELECT COUNT(DISTINCT c) FROM (SELECT id, REPLACE(uuid_short(), '0', CAST('o' AS CHAR CHARACTER SET ucs2)) AS c FROM t1) AS d1; +COUNT(DISTINCT c) +3 +SELECT DISTINCT REPLACE(uuid_short(), '0', CAST('o' AS CHAR CHARACTER SET ucs2)) AS c FROM t1; +c +xxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxx +SELECT COUNT(DISTINCT c) FROM (SELECT id, INSERT(uuid_short(), 1, 1, CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1) AS d1; +COUNT(DISTINCT c) +3 +SELECT DISTINCT INSERT(uuid_short(), 1, 1, CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1; +c +xxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxx +SELECT COUNT(DISTINCT c) FROM (SELECT id, CONCAT(uuid_short(), CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1) AS d1; +COUNT(DISTINCT c) +3 +SELECT DISTINCT CONCAT(uuid_short(), CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1; +c +xxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxx +xxxxxxxxxxxxxxxxx +DROP TABLE t1; +# # End of 5.5 tests # diff --git a/mysql-test/r/ctype_utf8mb4.result b/mysql-test/r/ctype_utf8mb4.result index 17a1a2f..2c0bdfb 100644 --- a/mysql-test/r/ctype_utf8mb4.result +++ b/mysql-test/r/ctype_utf8mb4.result @@ -2656,6 +2656,29 @@ SELECT LENGTH(data) AS len FROM (SELECT REPEAT('☃', 65536) AS data ) AS sub; len 196608 # +# MDEV-15624 Changing the default character set to utf8mb4 changes query evaluation in a very surprising way +# +SET NAMES utf8mb4; +CREATE TABLE t1 (id INT); +INSERT INTO t1 VALUES (1),(2),(3); +SELECT COUNT(DISTINCT c) FROM (SELECT id, REPLACE(UUID(), "-", "") AS c FROM t1) AS d1; +COUNT(DISTINCT c) +3 +SELECT DISTINCT INSERT(uuid(), 9, 1, "X") AS c FROM t1; +c +xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +SELECT COUNT(DISTINCT c) FROM (SELECT id, INSERT(UUID(), 9, 1, "X") AS c FROM t1) AS d1; +COUNT(DISTINCT c) +3 +SELECT DISTINCT INSERT(UUID(), 9, 1, "X") AS c FROM t1; +c +xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +DROP TABLE t1; +# # End of 5.5 tests # # diff --git a/mysql-test/t/ctype_ucs.test b/mysql-test/t/ctype_ucs.test index b3d0be4..6f846ea 100644 --- a/mysql-test/t/ctype_ucs.test +++ b/mysql-test/t/ctype_ucs.test @@ -886,5 +886,27 @@ DROP TABLE t1; --echo # +--echo # MDEV-15624 Changing the default character set to utf8mb4 changes query evaluation in a very surprising way +--echo # + +SET NAMES utf8; +CREATE TABLE t1 (id INT); +INSERT INTO t1 VALUES (1),(2),(3); + +SELECT COUNT(DISTINCT c) FROM (SELECT id, REPLACE(uuid_short(), '0', CAST('o' AS CHAR CHARACTER SET ucs2)) AS c FROM t1) AS d1; +--replace_column 1 xxxxxxxxxxxxxxxxx +SELECT DISTINCT REPLACE(uuid_short(), '0', CAST('o' AS CHAR CHARACTER SET ucs2)) AS c FROM t1; + +SELECT COUNT(DISTINCT c) FROM (SELECT id, INSERT(uuid_short(), 1, 1, CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1) AS d1; +--replace_column 1 xxxxxxxxxxxxxxxxx +SELECT DISTINCT INSERT(uuid_short(), 1, 1, CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1; + +SELECT COUNT(DISTINCT c) FROM (SELECT id, CONCAT(uuid_short(), CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1) AS d1; +--replace_column 1 xxxxxxxxxxxxxxxxx +SELECT DISTINCT CONCAT(uuid_short(), CAST('0' AS CHAR CHARACTER SET ucs2)) AS c FROM t1; +DROP TABLE t1; + + +--echo # --echo # End of 5.5 tests --echo # diff --git a/mysql-test/t/ctype_utf8mb4.test b/mysql-test/t/ctype_utf8mb4.test index c240f26..551a570 100644 --- a/mysql-test/t/ctype_utf8mb4.test +++ b/mysql-test/t/ctype_utf8mb4.test @@ -1859,6 +1859,25 @@ SELECT LENGTH(data) AS len FROM (SELECT REPEAT('☃', 65535) AS data ) AS sub; SELECT LENGTH(data) AS len FROM (SELECT REPEAT('☃', 65536) AS data ) AS sub; --echo # +--echo # MDEV-15624 Changing the default character set to utf8mb4 changes query evaluation in a very surprising way +--echo # + +SET NAMES utf8mb4; +CREATE TABLE t1 (id INT); +INSERT INTO t1 VALUES (1),(2),(3); + +SELECT COUNT(DISTINCT c) FROM (SELECT id, REPLACE(UUID(), "-", "") AS c FROM t1) AS d1; +--replace_column 1 xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +SELECT DISTINCT INSERT(uuid(), 9, 1, "X") AS c FROM t1; + +SELECT COUNT(DISTINCT c) FROM (SELECT id, INSERT(UUID(), 9, 1, "X") AS c FROM t1) AS d1; +--replace_column 1 xxxxxxxxxxxxx-xxxx-xxxx-xxxxxxxxxxxx +SELECT DISTINCT INSERT(UUID(), 9, 1, "X") AS c FROM t1; + +DROP TABLE t1; + + +--echo # --echo # End of 5.5 tests --echo # diff --git a/sql/item_func.h b/sql/item_func.h index 60122f0..5781822 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -2133,6 +2133,8 @@ class Item_func_uuid_short :public Item_int_func Item_func_uuid_short() :Item_int_func() {} const char *func_name() const { return "uuid_short"; } longlong val_int(); + bool const_item() const { return false; } + table_map used_tables() const { return RAND_TABLE_BIT; } void fix_length_and_dec() { max_length= 21; unsigned_flag=1; } bool check_vcol_func_processor(uchar *int_arg) diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 006b1b9..c1138c2 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -997,6 +997,7 @@ class Item_func_uuid: public Item_str_func DERIVATION_COERCIBLE, MY_REPERTOIRE_ASCII); fix_char_length(MY_UUID_STRING_LENGTH); } + bool const_item() const { return false; } table_map used_tables() const { return RAND_TABLE_BIT; } const char *func_name() const{ return "uuid"; } String *val_str(String *);

1 0