- commits - lists.mariadb.org

[Commits] a858163c050: MDEV-15950: LOAD DATA INTO compex_view crashed
by Varun 29 Jan '19

29 Jan '19

revision-id: a858163c050203cef3a6a1bd6c54e3138641321d (mariadb-10.0.37-59-ga858163c050) parent(s): 1f548cba6eeb4833f077326e51682c52294468bc author: Varun Gupta committer: Varun Gupta timestamp: 2019-01-29 16:08:59 +0530 message: MDEV-15950: LOAD DATA INTO compex_view crashed For multi-table views with LOAD, updates are not allowed, so we should just throw an error. --- mysql-test/r/loaddata.result | 26 ++++++++++++++++++++++++++ mysql-test/t/loaddata.test | 31 +++++++++++++++++++++++++++++++ sql/sql_load.cc | 5 +++++ 3 files changed, 62 insertions(+) diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 7e3f8e91eb2..d71032a0aca 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -574,3 +574,29 @@ a b 6 6 DROP VIEW IF EXISTS v2,t2; DROP TABLE IF EXISTS t1; +# +# MDEV-15950: LOAD DATA INTO compex_view crashed +# +create table t1 (a int, b int); +create table t0 (x int, y int); +CREATE OR REPLACE VIEW v1 AS SELECT * FROM t1,t0; +CREATE VIEW v2 AS SELECT * FROM v1; +LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE v1 +FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n'; +ERROR HY000: Incorrect usage of Multi-table VIEW and LOAD +LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE v2 +FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n'; +ERROR HY000: Incorrect usage of Multi-table VIEW and LOAD +DROP VIEW IF EXISTS v2,v1; +DROP TABLE IF EXISTS t1,t0; +CREATE OR REPLACE TABLE t1 (a INT, b INT, PRIMARY KEY (a), UNIQUE(b)); +INSERT INTO t1 VALUES (1,1); +CREATE OR REPLACE TABLE t2 (c INT); +CREATE OR REPLACE VIEW v AS SELECT t1.* FROM t1 JOIN t2; +SELECT a, b FROM t1 INTO OUTFILE '15645.data'; +LOAD DATA INFILE '15645.data' IGNORE INTO TABLE v (a,b); +ERROR HY000: Incorrect usage of Multi-table VIEW and LOAD +LOAD DATA INFILE '15645.data' REPLACE INTO TABLE v (a,b); +ERROR HY000: Incorrect usage of Multi-table VIEW and LOAD +drop table t1,t2; +drop view v; diff --git a/mysql-test/t/loaddata.test b/mysql-test/t/loaddata.test index 50d5615e58c..66fe7073a37 100644 --- a/mysql-test/t/loaddata.test +++ b/mysql-test/t/loaddata.test @@ -690,3 +690,34 @@ select * from v2; select * from t2; DROP VIEW IF EXISTS v2,t2; DROP TABLE IF EXISTS t1; + +--echo # +--echo # MDEV-15950: LOAD DATA INTO compex_view crashed +--echo # +create table t1 (a int, b int); +create table t0 (x int, y int); +CREATE OR REPLACE VIEW v1 AS SELECT * FROM t1,t0; +CREATE VIEW v2 AS SELECT * FROM v1; + +--error ER_WRONG_USAGE +LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE v1 +FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n'; + +--error ER_WRONG_USAGE +LOAD DATA INFILE '../../std_data/loaddata7.dat' INTO TABLE v2 +FIELDS TERMINATED BY ',' LINES TERMINATED BY '\r\n'; + +DROP VIEW IF EXISTS v2,v1; +DROP TABLE IF EXISTS t1,t0; + +CREATE OR REPLACE TABLE t1 (a INT, b INT, PRIMARY KEY (a), UNIQUE(b)); +INSERT INTO t1 VALUES (1,1); +CREATE OR REPLACE TABLE t2 (c INT); +CREATE OR REPLACE VIEW v AS SELECT t1.* FROM t1 JOIN t2; +SELECT a, b FROM t1 INTO OUTFILE '15645.data'; +--error ER_WRONG_USAGE +LOAD DATA INFILE '15645.data' IGNORE INTO TABLE v (a,b); +--error ER_WRONG_USAGE +LOAD DATA INFILE '15645.data' REPLACE INTO TABLE v (a,b); +drop table t1,t2; +drop view v; diff --git a/sql/sql_load.cc b/sql/sql_load.cc index c369b040106..5b805bbad90 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -326,6 +326,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, my_error(ER_NON_UPDATABLE_TABLE, MYF(0), table_list->alias, "LOAD"); DBUG_RETURN(TRUE); } + if (table_list->is_multitable()) + { + my_error(ER_WRONG_USAGE, MYF(0), "Multi-table VIEW", "LOAD"); + DBUG_RETURN(TRUE); + } if (table_list->prepare_where(thd, 0, TRUE) || table_list->prepare_check_option(thd)) {

1 0

[Commits] c991939bab7: MariaDB detect incorrect table name
by Oleksandr Byelkin 29 Jan '19

29 Jan '19

revision-id: c991939bab7677b0af2ac3fd8c504d858e44e8dd (mariadb-10.0.37-66-gc991939bab7) parent(s): c4f97d3cfa46a7f1b283926dd7fedb648566283f author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-29 09:34:08 +0100 message: MariaDB detect incorrect table name --- storage/tokudb/mysql-test/tokudb_bugs/r/PS-4979.result | 2 +- storage/tokudb/mysql-test/tokudb_bugs/t/PS-4979.test | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/storage/tokudb/mysql-test/tokudb_bugs/r/PS-4979.result b/storage/tokudb/mysql-test/tokudb_bugs/r/PS-4979.result index f0d2f93f630..5bf7a270fe5 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/r/PS-4979.result +++ b/storage/tokudb/mysql-test/tokudb_bugs/r/PS-4979.result @@ -1,2 +1,2 @@ CREATE TABLE `#mysql50#q.q`(f1 INT KEY) ENGINE=TOKUDB; -ERROR HY000: Got error 1632 from storage engine +ERROR 42000: Incorrect table name '#mysql50#q.q' diff --git a/storage/tokudb/mysql-test/tokudb_bugs/t/PS-4979.test b/storage/tokudb/mysql-test/tokudb_bugs/t/PS-4979.test index 1e4b5d11922..cb902f6e52a 100644 --- a/storage/tokudb/mysql-test/tokudb_bugs/t/PS-4979.test +++ b/storage/tokudb/mysql-test/tokudb_bugs/t/PS-4979.test @@ -7,6 +7,7 @@ # engine expects a table name in the form of a relative path like # "./databasename/tablename". InnoDB detects this in parsing the table name # during the creation and returns an error. +# MariaDB server detect above error. ---error ER_GET_ERRNO +--error ER_WRONG_TABLE_NAME CREATE TABLE `#mysql50#q.q`(f1 INT KEY) ENGINE=TOKUDB;

1 0

[Commits] 84774c5: MDEV-17631 select_handler for a full query pushdown
by IgorBabaev 29 Jan '19

29 Jan '19

revision-id: 84774c5dda7a4eaf4d8bc5a5ee5100a8286dc451 (mariadb-10.3.6-133-g84774c5) parent(s): 23e8c2f07473bb1bc7d5430e59f60729b9d92e56 author: Igor Babaev committer: Igor Babaev timestamp: 2019-01-28 19:24:00 -0800 message: MDEV-17631 select_handler for a full query pushdown MDEV-17096 Pushdown of simple derived tables to storage engines Put the implementation of the interfaces derived_handler and select_handler for FEDERATEDX into the new files federatedx_pushdown.h and federated_pushdown.cc. --- sql/select_handler.cc | 1 + sql/sql_derived.cc | 6 +- sql/sql_select.cc | 22 +-- storage/federatedx/federatedx_pushdown.cc | 273 ++++++++++++++++++++++++++++++ storage/federatedx/federatedx_pushdown.h | 63 +++++++ storage/federatedx/ha_federatedx.cc | 246 +-------------------------- storage/federatedx/ha_federatedx.h | 38 +---- 7 files changed, 356 insertions(+), 293 deletions(-) diff --git a/sql/select_handler.cc b/sql/select_handler.cc index da367f5..17475f4 100644 --- a/sql/select_handler.cc +++ b/sql/select_handler.cc @@ -13,6 +13,7 @@ Pushdown_select::Pushdown_select(SELECT_LEX *sel, select_handler *h) Pushdown_select::~Pushdown_select() { delete handler; + select->select_h= NULL; } bool Pushdown_select::init() diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 7e7ac02..9b17dd3 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -918,7 +918,11 @@ bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived) { if (!(derived->pushdown_derived= new (thd->mem_root) Pushdown_derived(derived, derived->dt_handler))) - DBUG_RETURN(1); + { + delete derived->dt_handler; + derived->dt_handler= NULL; + DBUG_RETURN(1); + } } lex->current_select= first_select; diff --git a/sql/sql_select.cc b/sql/sql_select.cc index 2753f1a..7c5287d 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -4065,18 +4065,11 @@ void JOIN::exec_inner() order != 0 && !skip_sort_order, select_distinct, !table_count ? "No tables used" : NullS); - if (select_lex->pushdown_select) - { - delete select_lex->pushdown_select; - select_lex->pushdown_select= NULL; - } DBUG_VOID_RETURN; } else if (select_lex->pushdown_select) { error= select_lex->pushdown_select->execute(); - delete select_lex->pushdown_select; - select_lex->pushdown_select= NULL; DBUG_VOID_RETURN; } else @@ -4290,16 +4283,18 @@ mysql_select(THD *thd, } } -#if 1 select_lex->select_h= select_lex->find_select_handler(thd); if (select_lex->select_h) { if (!(select_lex->pushdown_select= new (thd->mem_root) Pushdown_select(select_lex, select_lex->select_h))) + { + delete select_lex->select_h; + select_lex->select_h= NULL; DBUG_RETURN(TRUE); + } } -#endif if ((err= join->optimize())) { @@ -4322,8 +4317,15 @@ mysql_select(THD *thd, select_lex->where= join->conds_history; select_lex->having= join->having_history; } - + err: + + if (select_lex->pushdown_select) + { + delete select_lex->pushdown_select; + select_lex->pushdown_select= NULL; + } + if (free_join) { THD_STAGE_INFO(thd, stage_end); diff --git a/storage/federatedx/federatedx_pushdown.cc b/storage/federatedx/federatedx_pushdown.cc new file mode 100644 index 0000000..bfe421c --- /dev/null +++ b/storage/federatedx/federatedx_pushdown.cc @@ -0,0 +1,273 @@ +/* + Copyright (c) 2019 MariaDB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +/* !!! For inclusion into ha_federatedx.cc */ + +static derived_handler* +create_federatedx_derived_handler(THD* thd, TABLE_LIST *derived) +{ + ha_federatedx_derived_handler* handler = NULL; + handlerton *ht= 0; + + SELECT_LEX_UNIT *unit= derived->derived; + + for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) + { + if (!(sl->join)) + return 0; + for (TABLE_LIST *tbl= sl->join->tables_list; tbl; tbl= tbl->next_local) + { + if (!tbl->table) + return 0; + if (!ht) + ht= tbl->table->file->partition_ht(); + else if (ht != tbl->table->file->partition_ht()) + return 0; + } + } + + handler= new ha_federatedx_derived_handler(thd, derived); + + return handler; +} + + +/* + Implementation class of the derived_handler interface for FEDERATEDX: + class implementation +*/ + +ha_federatedx_derived_handler::ha_federatedx_derived_handler(THD *thd, + TABLE_LIST *dt) + : derived_handler(thd, federatedx_hton), + share(NULL), txn(NULL), iop(NULL), stored_result(NULL) +{ + derived= dt; +} + +ha_federatedx_derived_handler::~ha_federatedx_derived_handler() {} + +int ha_federatedx_derived_handler::init_scan() +{ + char query_buff[4096]; + THD *thd; + int rc= 0; + + DBUG_ENTER("ha_federatedx_derived_handler::init_scan"); + + TABLE *table= derived->get_first_table()->table; + ha_federatedx *h= (ha_federatedx *) table->file; + iop= &h->io; + share= get_share(table->s->table_name.str, table); + thd= table->in_use; + txn= h->get_txn(thd); + if ((rc= txn->acquire(share, thd, TRUE, iop))) + DBUG_RETURN(rc); + + String derived_query(query_buff, sizeof(query_buff), thd->charset()); + derived_query.length(0); + derived->derived->print(&derived_query, QT_ORDINARY); + + if ((*iop)->query(derived_query.ptr(), derived_query.length())) + goto err; + + stored_result= (*iop)->store_result(); + if (!stored_result) + goto err; + + DBUG_RETURN(0); + +err: + DBUG_RETURN(HA_FEDERATEDX_ERROR_WITH_REMOTE_SYSTEM); +} + +int ha_federatedx_derived_handler::next_row() +{ + int rc; + FEDERATEDX_IO_ROW *row; + ulong *lengths; + Field **field; + int column= 0; + Time_zone *saved_time_zone= table->in_use->variables.time_zone; + DBUG_ENTER("ha_federatedx_derived_handler::next_row"); + + if ((rc= txn->acquire(share, table->in_use, TRUE, iop))) + DBUG_RETURN(rc); + + if (!(row= (*iop)->fetch_row(stored_result))) + DBUG_RETURN(HA_ERR_END_OF_FILE); + + /* Convert row to internal format */ + table->in_use->variables.time_zone= UTC; + lengths= (*iop)->fetch_lengths(stored_result); + + for (field= table->field; *field; field++, column++) + { + if ((*iop)->is_column_null(row, column)) + (*field)->set_null(); + else + { + (*field)->set_notnull(); + (*field)->store((*iop)->get_column_data(row, column), + lengths[column], &my_charset_bin); + } + } + table->in_use->variables.time_zone= saved_time_zone; + + DBUG_RETURN(rc); +} + +int ha_federatedx_derived_handler::end_scan() +{ + DBUG_ENTER("ha_federatedx_derived_handler::end_scan"); + + (*iop)->free_result(stored_result); + + free_share(txn, share); + + DBUG_RETURN(0); +} + +void ha_federatedx_derived_handler::print_error(int, unsigned long) +{ +} + + +static select_handler* +create_federatedx_select_handler(THD* thd, SELECT_LEX *sel) +{ + ha_federatedx_select_handler* handler = NULL; + handlerton *ht= 0; + + for (TABLE_LIST *tbl= thd->lex->query_tables; tbl; tbl= tbl->next_global) + { + if (!tbl->table) + return 0; + if (!ht) + ht= tbl->table->file->partition_ht(); + else if (ht != tbl->table->file->partition_ht()) + return 0; + } + + handler= new ha_federatedx_select_handler(thd, sel); + + return handler; +} + +/* + Implementation class of the select_handler interface for FEDERATEDX: + class implementation +*/ + +ha_federatedx_select_handler::ha_federatedx_select_handler(THD *thd, + SELECT_LEX *sel) + : select_handler(thd, federatedx_hton), + share(NULL), txn(NULL), iop(NULL), stored_result(NULL) +{ + select= sel; +} + +ha_federatedx_select_handler::~ha_federatedx_select_handler() {} + +int ha_federatedx_select_handler::init_scan() +{ + int rc= 0; + + DBUG_ENTER("ha_federatedx_select_handler::init_scan"); + + TABLE *table= 0; + for (TABLE_LIST *tbl= thd->lex->query_tables; tbl; tbl= tbl->next_global) + { + if (!tbl->table) + continue; + table= tbl->table; + break; + } + ha_federatedx *h= (ha_federatedx *) table->file; + iop= &h->io; + share= get_share(table->s->table_name.str, table); + txn= h->get_txn(thd); + if ((rc= txn->acquire(share, thd, TRUE, iop))) + DBUG_RETURN(rc); + + if ((*iop)->query(thd->query(), thd->query_length())) + goto err; + + stored_result= (*iop)->store_result(); + if (!stored_result) + goto err; + + DBUG_RETURN(0); + +err: + DBUG_RETURN(HA_FEDERATEDX_ERROR_WITH_REMOTE_SYSTEM); +} + +int ha_federatedx_select_handler::next_row() +{ + int rc= 0; + FEDERATEDX_IO_ROW *row; + ulong *lengths; + Field **field; + int column= 0; + Time_zone *saved_time_zone= table->in_use->variables.time_zone; + DBUG_ENTER("ha_federatedx_select_handler::next_row"); + + if ((rc= txn->acquire(share, table->in_use, TRUE, iop))) + DBUG_RETURN(rc); + + if (!(row= (*iop)->fetch_row(stored_result))) + DBUG_RETURN(HA_ERR_END_OF_FILE); + + /* Convert row to internal format */ + table->in_use->variables.time_zone= UTC; + lengths= (*iop)->fetch_lengths(stored_result); + + for (field= table->field; *field; field++, column++) + { + if ((*iop)->is_column_null(row, column)) + (*field)->set_null(); + else + { + (*field)->set_notnull(); + (*field)->store((*iop)->get_column_data(row, column), + lengths[column], &my_charset_bin); + } + } + table->in_use->variables.time_zone= saved_time_zone; + + DBUG_RETURN(rc); +} + +int ha_federatedx_select_handler::end_scan() +{ + DBUG_ENTER("ha_federatedx_derived_handler::end_scan"); + + free_tmp_table(thd, table); + table= 0; + + (*iop)->free_result(stored_result); + + free_share(txn, share); + + DBUG_RETURN(0); +} + +void ha_federatedx_select_handler::print_error(int, unsigned long) +{ +} + + diff --git a/storage/federatedx/federatedx_pushdown.h b/storage/federatedx/federatedx_pushdown.h new file mode 100644 index 0000000..961571b --- /dev/null +++ b/storage/federatedx/federatedx_pushdown.h @@ -0,0 +1,63 @@ +/* + Copyright (c) 2019 MariaDB + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "derived_handler.h" +#include "select_handler.h" + +/* + Implementation class of the derived_handler interface for FEDERATEDX: + class declaration +*/ + +class ha_federatedx_derived_handler: public derived_handler +{ +private: + FEDERATEDX_SHARE *share; + federatedx_txn *txn; + federatedx_io **iop; + FEDERATEDX_IO_RESULT *stored_result; + +public: + ha_federatedx_derived_handler(THD* thd_arg, TABLE_LIST *tbl); + ~ha_federatedx_derived_handler(); + int init_scan(); + int next_row(); + int end_scan(); + void print_error(int, unsigned long); +}; + + +/* + Implementation class of the select_handler interface for FEDERATEDX: + class declaration +*/ + +class ha_federatedx_select_handler: public select_handler +{ +private: + FEDERATEDX_SHARE *share; + federatedx_txn *txn; + federatedx_io **iop; + FEDERATEDX_IO_RESULT *stored_result; + +public: + ha_federatedx_select_handler(THD* thd_arg, SELECT_LEX *sel); + ~ha_federatedx_select_handler(); + int init_scan(); + int next_row(); + int end_scan(); + void print_error(int, unsigned long); +}; diff --git a/storage/federatedx/ha_federatedx.cc b/storage/federatedx/ha_federatedx.cc index 174ee23..918fbef 100644 --- a/storage/federatedx/ha_federatedx.cc +++ b/storage/federatedx/ha_federatedx.cc @@ -3677,251 +3677,7 @@ int ha_federatedx::discover_assisted(handlerton *hton, THD* thd, return error; } - -static derived_handler* -create_federatedx_derived_handler(THD* thd, TABLE_LIST *derived) -{ - ha_federatedx_derived_handler* handler = NULL; - handlerton *ht= 0; - - SELECT_LEX_UNIT *unit= derived->derived; - - for (SELECT_LEX *sl= unit->first_select(); sl; sl= sl->next_select()) - { - if (!(sl->join)) - return 0; - for (TABLE_LIST *tbl= sl->join->tables_list; tbl; tbl= tbl->next_local) - { - if (!tbl->table) - return 0; - if (!ht) - ht= tbl->table->file->partition_ht(); - else if (ht != tbl->table->file->partition_ht()) - return 0; - } - } - - handler= new ha_federatedx_derived_handler(thd, derived); - - return handler; -} - - -ha_federatedx_derived_handler::ha_federatedx_derived_handler(THD *thd, - TABLE_LIST *dt) - : derived_handler(thd, federatedx_hton), - share(NULL), txn(NULL), iop(NULL), stored_result(NULL) -{ - derived= dt; -} - -ha_federatedx_derived_handler::~ha_federatedx_derived_handler() {} - -int ha_federatedx_derived_handler::init_scan() -{ - char query_buff[4096]; - THD *thd; - int rc= 0; - - DBUG_ENTER("ha_federatedx_derived_handler::init_scan"); - - TABLE *table= derived->get_first_table()->table; - ha_federatedx *h= (ha_federatedx *) table->file; - iop= &h->io; - share= get_share(table->s->table_name.str, table); - thd= table->in_use; - txn= h->get_txn(thd); - if ((rc= txn->acquire(share, thd, TRUE, iop))) - DBUG_RETURN(rc); - - String derived_query(query_buff, sizeof(query_buff), thd->charset()); - derived_query.length(0); - derived->derived->print(&derived_query, QT_ORDINARY); - - if ((*iop)->query(derived_query.ptr(), derived_query.length())) - goto err; - - stored_result= (*iop)->store_result(); - if (!stored_result) - goto err; - - DBUG_RETURN(0); - -err: - DBUG_RETURN(HA_FEDERATEDX_ERROR_WITH_REMOTE_SYSTEM); -} - -int ha_federatedx_derived_handler::next_row() -{ - int rc; - FEDERATEDX_IO_ROW *row; - ulong *lengths; - Field **field; - int column= 0; - Time_zone *saved_time_zone= table->in_use->variables.time_zone; - DBUG_ENTER("ha_federatedx_derived_handler::next_row"); - - if ((rc= txn->acquire(share, table->in_use, TRUE, iop))) - DBUG_RETURN(rc); - - if (!(row= (*iop)->fetch_row(stored_result))) - DBUG_RETURN(HA_ERR_END_OF_FILE); - - /* Convert row to internal format */ - table->in_use->variables.time_zone= UTC; - lengths= (*iop)->fetch_lengths(stored_result); - - for (field= table->field; *field; field++, column++) - { - if ((*iop)->is_column_null(row, column)) - (*field)->set_null(); - else - { - (*field)->set_notnull(); - (*field)->store((*iop)->get_column_data(row, column), - lengths[column], &my_charset_bin); - } - } - table->in_use->variables.time_zone= saved_time_zone; - - DBUG_RETURN(rc); -} - -int ha_federatedx_derived_handler::end_scan() -{ - DBUG_ENTER("ha_federatedx_derived_handler::end_scan"); - - (*iop)->free_result(stored_result); - - free_share(txn, share); - - DBUG_RETURN(0); -} - -void ha_federatedx_derived_handler::print_error(int, unsigned long) -{ -} - - -static select_handler* -create_federatedx_select_handler(THD* thd, SELECT_LEX *sel) -{ - ha_federatedx_select_handler* handler = NULL; - handlerton *ht= 0; - - for (TABLE_LIST *tbl= thd->lex->query_tables; tbl; tbl= tbl->next_global) - { - if (!tbl->table) - return 0; - if (!ht) - ht= tbl->table->file->partition_ht(); - else if (ht != tbl->table->file->partition_ht()) - return 0; - } - - handler= new ha_federatedx_select_handler(thd, sel); - - return handler; -} - -ha_federatedx_select_handler::ha_federatedx_select_handler(THD *thd, - SELECT_LEX *sel) - : select_handler(thd, federatedx_hton), - share(NULL), txn(NULL), iop(NULL), stored_result(NULL) -{ - select= sel; -} - -ha_federatedx_select_handler::~ha_federatedx_select_handler() {} - -int ha_federatedx_select_handler::init_scan() -{ - int rc= 0; - - DBUG_ENTER("ha_federatedx_select_handler::init_scan"); - - TABLE *table= 0; - for (TABLE_LIST *tbl= thd->lex->query_tables; tbl; tbl= tbl->next_global) - { - if (!tbl->table) - continue; - table= tbl->table; - break; - } - ha_federatedx *h= (ha_federatedx *) table->file; - iop= &h->io; - share= get_share(table->s->table_name.str, table); - txn= h->get_txn(thd); - if ((rc= txn->acquire(share, thd, TRUE, iop))) - DBUG_RETURN(rc); - - if ((*iop)->query(thd->query(), thd->query_length())) - goto err; - - stored_result= (*iop)->store_result(); - if (!stored_result) - goto err; - - DBUG_RETURN(0); - -err: - DBUG_RETURN(HA_FEDERATEDX_ERROR_WITH_REMOTE_SYSTEM); -} - -int ha_federatedx_select_handler::next_row() -{ - int rc= 0; - FEDERATEDX_IO_ROW *row; - ulong *lengths; - Field **field; - int column= 0; - Time_zone *saved_time_zone= table->in_use->variables.time_zone; - DBUG_ENTER("ha_federatedx_select_handler::next_row"); - - if ((rc= txn->acquire(share, table->in_use, TRUE, iop))) - DBUG_RETURN(rc); - - if (!(row= (*iop)->fetch_row(stored_result))) - DBUG_RETURN(HA_ERR_END_OF_FILE); - - /* Convert row to internal format */ - table->in_use->variables.time_zone= UTC; - lengths= (*iop)->fetch_lengths(stored_result); - - for (field= table->field; *field; field++, column++) - { - if ((*iop)->is_column_null(row, column)) - (*field)->set_null(); - else - { - (*field)->set_notnull(); - (*field)->store((*iop)->get_column_data(row, column), - lengths[column], &my_charset_bin); - } - } - table->in_use->variables.time_zone= saved_time_zone; - - DBUG_RETURN(rc); -} - -int ha_federatedx_select_handler::end_scan() -{ - DBUG_ENTER("ha_federatedx_derived_handler::end_scan"); - - free_tmp_table(thd, table); - table= 0; - - (*iop)->free_result(stored_result); - - free_share(txn, share); - - DBUG_RETURN(0); -} - -void ha_federatedx_select_handler::print_error(int, unsigned long) -{ -} - +#include "federatedx_pushdown.cc" struct st_mysql_storage_engine federatedx_storage_engine= { MYSQL_HANDLERTON_INTERFACE_VERSION }; diff --git a/storage/federatedx/ha_federatedx.h b/storage/federatedx/ha_federatedx.h index 3a5180f..c6af5f2 100644 --- a/storage/federatedx/ha_federatedx.h +++ b/storage/federatedx/ha_federatedx.h @@ -42,8 +42,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <my_global.h> #include <thr_lock.h> #include "handler.h" -#include "derived_handler.h" -#include "select_handler.h" class federatedx_io; @@ -468,40 +466,6 @@ extern federatedx_io *instantiate_io_mysql(MEM_ROOT *server_root, extern federatedx_io *instantiate_io_null(MEM_ROOT *server_root, FEDERATEDX_SERVER *server); - -class ha_federatedx_derived_handler: public derived_handler -{ -private: - FEDERATEDX_SHARE *share; - federatedx_txn *txn; - federatedx_io **iop; - FEDERATEDX_IO_RESULT *stored_result; - -public: - ha_federatedx_derived_handler(THD* thd_arg, TABLE_LIST *tbl); - ~ha_federatedx_derived_handler(); - int init_scan(); - int next_row(); - int end_scan(); - void print_error(int, unsigned long); -}; - - -class ha_federatedx_select_handler: public select_handler -{ -private: - FEDERATEDX_SHARE *share; - federatedx_txn *txn; - federatedx_io **iop; - FEDERATEDX_IO_RESULT *stored_result; - -public: - ha_federatedx_select_handler(THD* thd_arg, SELECT_LEX *sel); - ~ha_federatedx_select_handler(); - int init_scan(); - int next_row(); - int end_scan(); - void print_error(int, unsigned long); -}; +#include "federatedx_pushdown.h" #endif /* HA_FEDERATEDX_INCLUDED */

1 0

[Commits] c58f7147cd7: Fix rocksdb.hermitage test to work with Range Locking.
by Sergei Petrunia 28 Jan '19

28 Jan '19

revision-id: c58f7147cd79ddcc0ddeb8acdd505916b12291b8 (fb-prod201801-202-gc58f7147cd7) parent(s): da32581b18cf52c578d8529e8a0df38dda6ebe4f author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-28 23:50:40 +0300 message: Fix rocksdb.hermitage test to work with Range Locking. Transactional Isolation with Range Locking is similar to InnoDB, so REPEATABLE-READ is closer to (but not the same as) READ-COMMITTED. (The result differences in hermitage-range_locking.result were checked against InnoDB). --- .../suite/rocksdb/r/hermitage-range_locking.result | 652 +++++++++++++++++++++ .../suite/rocksdb/t/hermitage-range_locking.test | 15 + mysql-test/suite/rocksdb/t/hermitage.inc | 14 +- mysql-test/suite/rocksdb/t/hermitage.test | 3 + 4 files changed, 678 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/rocksdb/r/hermitage-range_locking.result b/mysql-test/suite/rocksdb/r/hermitage-range_locking.result new file mode 100644 index 00000000000..af6a0028629 --- /dev/null +++ b/mysql-test/suite/rocksdb/r/hermitage-range_locking.result @@ -0,0 +1,652 @@ +DROP TABLE IF EXISTS test; +connect con1,localhost,root,,; +SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; +connect con2,localhost,root,,; +SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; +connect con3,localhost,root,,; +SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED; +connection con1; +create table test (id int primary key, value int) engine=rocksdb; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test; +id value +1 10 +2 20 +update test set value = 101 where id = 1; +connection con2; +select * from test; +id value +1 10 +2 20 +connection con1; +rollback; +connection con2; +select * from test; +id value +1 10 +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = 101 where id = 1; +connection con2; +select * from test; +id value +1 10 +2 20 +connection con1; +update test set value = 11 where id = 1; +commit; +connection con2; +select * from test; +id value +1 11 +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = 11 where id = 1; +connection con2; +update test set value = 22 where id = 2; +connection con1; +select * from test where id = 2; +id value +2 20 +connection con2; +select * from test where id = 1; +id value +1 10 +connection con1; +commit; +connection con2; +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = 11 where id = 1; +update test set value = 19 where id = 2; +connection con2; +update test set value = 12 where id = 1; +connection con1; +commit; +connection con2; +connection con3; +select * from test; +id value +1 11 +2 19 +connection con2; +update test set value = 18 where id = 2; +connection con3; +select * from test; +id value +1 11 +2 19 +connection con2; +commit; +connection con3; +select * from test; +id value +1 12 +2 18 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where value = 30; +id value +connection con2; +insert into test (id, value) values(3, 30); +commit; +connection con1; +select * from test where value % 3 = 0; +id value +3 30 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = value + 10; +connection con2; +select variable_value into @a from information_schema.global_status where variable_name='rocksdb_snapshot_conflict_errors'; +select * from test; +id value +1 10 +2 20 +delete from test where value = 20; +connection con1; +commit; +connection con2; +select * from test; +id value +2 30 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id = 1; +id value +1 10 +connection con2; +select * from test where id = 1; +id value +1 10 +connection con1; +update test set value = 11 where id = 1; +connection con2; +update test set value = 12 where id = 1; +connection con1; +commit; +connection con2; +select * from test; +id value +1 12 +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id = 1; +id value +1 10 +connection con2; +select * from test where id = 1; +id value +1 10 +select * from test where id = 2; +id value +2 20 +update test set value = 12 where id = 1; +update test set value = 18 where id = 2; +commit; +connection con1; +select * from test where id = 2; +id value +2 18 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where value % 5 = 0; +id value +1 10 +2 20 +connection con2; +update test set value = 12 where value = 10; +commit; +connection con1; +select * from test where value % 3 = 0; +id value +1 12 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id = 1; +id value +1 10 +connection con2; +select * from test; +id value +1 10 +2 20 +update test set value = 12 where id = 1; +update test set value = 18 where id = 2; +commit; +connection con1; +delete from test where value = 20; +select * from test where id = 2; +id value +2 18 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id in (1,2); +id value +1 10 +2 20 +connection con2; +select * from test where id in (1,2); +id value +1 10 +2 20 +connection con1; +update test set value = 11 where id = 1; +connection con2; +update test set value = 21 where id = 2; +connection con1; +commit; +connection con2; +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where value % 3 = 0; +id value +connection con2; +select * from test where value % 3 = 0; +id value +connection con1; +insert into test (id, value) values(3, 30); +connection con2; +insert into test (id, value) values(4, 42); +connection con1; +commit; +connection con2; +commit; +select * from test where value % 3 = 0; +id value +3 30 +4 42 +connection con1; +select * from test where value % 3 = 0; +id value +3 30 +4 42 +connection default; +drop table test; +disconnect con1; +disconnect con2; +disconnect con3; +DROP TABLE IF EXISTS test; +connect con1,localhost,root,,; +SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; +connect con2,localhost,root,,; +SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; +connect con3,localhost,root,,; +SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ; +connection con1; +create table test (id int primary key, value int) engine=rocksdb; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test; +id value +1 10 +2 20 +update test set value = 101 where id = 1; +connection con2; +select * from test; +id value +1 10 +2 20 +connection con1; +rollback; +connection con2; +select * from test; +id value +1 10 +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = 101 where id = 1; +connection con2; +select * from test; +id value +1 10 +2 20 +connection con1; +update test set value = 11 where id = 1; +commit; +connection con2; +select * from test; +id value +1 10 +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = 11 where id = 1; +connection con2; +update test set value = 22 where id = 2; +connection con1; +select * from test where id = 2; +id value +2 20 +connection con2; +select * from test where id = 1; +id value +1 10 +connection con1; +commit; +connection con2; +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = 11 where id = 1; +update test set value = 19 where id = 2; +connection con2; +update test set value = 12 where id = 1; +connection con1; +commit; +connection con2; +connection con3; +select * from test; +id value +1 11 +2 19 +connection con2; +update test set value = 18 where id = 2; +connection con3; +select * from test; +id value +1 11 +2 19 +connection con2; +commit; +connection con3; +select * from test; +id value +1 11 +2 19 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where value = 30; +id value +connection con2; +insert into test (id, value) values(3, 30); +commit; +connection con1; +select * from test where value % 3 = 0; +id value +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +update test set value = value + 10; +connection con2; +select variable_value into @a from information_schema.global_status where variable_name='rocksdb_snapshot_conflict_errors'; +select * from test; +id value +1 10 +2 20 +delete from test where value = 20; +connection con1; +commit; +connection con2; +select * from test; +id value +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id = 1; +id value +1 10 +connection con2; +select * from test where id = 1; +id value +1 10 +connection con1; +update test set value = 11 where id = 1; +connection con2; +update test set value = 12 where id = 1; +connection con1; +commit; +connection con2; +select * from test; +id value +1 12 +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id = 1; +id value +1 10 +connection con2; +select * from test where id = 1; +id value +1 10 +select * from test where id = 2; +id value +2 20 +update test set value = 12 where id = 1; +update test set value = 18 where id = 2; +commit; +connection con1; +select * from test where id = 2; +id value +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where value % 5 = 0; +id value +1 10 +2 20 +connection con2; +update test set value = 12 where value = 10; +commit; +connection con1; +select * from test where value % 3 = 0; +id value +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id = 1; +id value +1 10 +connection con2; +select * from test; +id value +1 10 +2 20 +update test set value = 12 where id = 1; +update test set value = 18 where id = 2; +commit; +connection con1; +delete from test where value = 20; +select * from test where id = 2; +id value +2 20 +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where id in (1,2); +id value +1 10 +2 20 +connection con2; +select * from test where id in (1,2); +id value +1 10 +2 20 +connection con1; +update test set value = 11 where id = 1; +connection con2; +update test set value = 21 where id = 2; +connection con1; +commit; +connection con2; +commit; +connection con1; +truncate table test; +insert into test (id, value) values (1, 10), (2, 20); +begin; +connection con2; +begin; +connection con3; +begin; +connection con1; +select * from test where value % 3 = 0; +id value +connection con2; +select * from test where value % 3 = 0; +id value +connection con1; +insert into test (id, value) values(3, 30); +connection con2; +insert into test (id, value) values(4, 42); +connection con1; +commit; +connection con2; +commit; +select * from test where value % 3 = 0; +id value +3 30 +4 42 +connection con1; +select * from test where value % 3 = 0; +id value +3 30 +4 42 +connection default; +drop table test; +disconnect con1; +disconnect con2; +disconnect con3; diff --git a/mysql-test/suite/rocksdb/t/hermitage-range_locking.test b/mysql-test/suite/rocksdb/t/hermitage-range_locking.test new file mode 100644 index 00000000000..55203af9cf8 --- /dev/null +++ b/mysql-test/suite/rocksdb/t/hermitage-range_locking.test @@ -0,0 +1,15 @@ +--source include/have_rocksdb.inc + +# Range locking uses InnoDB-like transaction isolation, which +# means the results differ from "true" Repeatable Read. +--source suite/rocksdb/include/have_range_locking.inc + + +# Hermitage is an attempt to test transaction isolation levels. +# https://github.com/ept/hermitage + +let $trx_isolation = READ COMMITTED; +--source hermitage.inc + +let $trx_isolation = REPEATABLE READ; +--source hermitage.inc diff --git a/mysql-test/suite/rocksdb/t/hermitage.inc b/mysql-test/suite/rocksdb/t/hermitage.inc index 17baf5b6c57..ae26bb7a1f9 100644 --- a/mysql-test/suite/rocksdb/t/hermitage.inc +++ b/mysql-test/suite/rocksdb/t/hermitage.inc @@ -108,6 +108,8 @@ select * from test where value % 3 = 0; commit; --source hermitage_init.inc +let $RC_OR_RANGE_LOCKING=`select @@tx_isolation='READ-COMMITTED' OR @@rocksdb_use_range_locking=1`; +let $RR_AND_NOT_RANGE_LOCKING=`select @@tx_isolation='REPEATABLE-READ' AND @@rocksdb_use_range_locking=0`; connection con1; update test set value = value + 10; connection con2; @@ -117,13 +119,13 @@ send delete from test where value = 20; connection con1; commit; connection con2; -if ($trx_isolation == "READ COMMITTED") +if ($RC_OR_RANGE_LOCKING) { reap; # RC: Returns 2 => 30 select * from test; } -if ($trx_isolation == "REPEATABLE READ") +if ($RR_AND_NOT_RANGE_LOCKING) { --error ER_LOCK_DEADLOCK reap; @@ -147,13 +149,13 @@ send update test set value = 12 where id = 1; connection con1; commit; connection con2; -if ($trx_isolation == "READ COMMITTED") +if ($RC_OR_RANGE_LOCKING) { reap; # RC: Returns 1 => 12 select * from test; } -if ($trx_isolation == "REPEATABLE READ") +if ($RR_AND_NOT_RANGE_LOCKING) { --error ER_LOCK_DEADLOCK reap; @@ -200,12 +202,12 @@ update test set value = 12 where id = 1; update test set value = 18 where id = 2; commit; connection con1; -if ($trx_isolation == "READ COMMITTED") +if ($RC_OR_RANGE_LOCKING) { delete from test where value = 20; # doesn't delete anything select * from test where id = 2; # shows 2 => 18 } -if ($trx_isolation == "REPEATABLE READ") +if ($RR_AND_NOT_RANGE_LOCKING) { --error ER_LOCK_DEADLOCK delete from test where value = 20; diff --git a/mysql-test/suite/rocksdb/t/hermitage.test b/mysql-test/suite/rocksdb/t/hermitage.test index e4138e8d89f..51f3f286a0e 100644 --- a/mysql-test/suite/rocksdb/t/hermitage.test +++ b/mysql-test/suite/rocksdb/t/hermitage.test @@ -1,5 +1,8 @@ --source include/have_rocksdb.inc +# See hermitage-range_locking variant +--source suite/rocksdb/include/not_range_locking.inc + # Hermitage is an attempt to test transaction isolation levels. # https://github.com/ept/hermitage

1 0

[Commits] da32581b18c: Update to latest range-locking RocksDB
by Sergei Petrunia 28 Jan '19

28 Jan '19

revision-id: da32581b18cf52c578d8529e8a0df38dda6ebe4f (fb-prod201801-201-gda32581b18c) parent(s): baf5e0efc8c73a043180a621df1d2a13e3a4d4e5 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-28 23:03:45 +0300 message: Update to latest range-locking RocksDB --- rocksdb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rocksdb b/rocksdb index 3ce77681b7c..a8f74c97879 160000 --- a/rocksdb +++ b/rocksdb @@ -1 +1 @@ -Subproject commit 3ce77681b7cc369e2f5c2a1f83216eb62776065d +Subproject commit a8f74c978795a37a5651b427eef0c8ef52220496

1 0

[Commits] a8f74c978: Don't attempt to free RangeLockMgr::cmp_ if it hasnt been initialized
by Sergei Petrunia 28 Jan '19

28 Jan '19

revision-id: a8f74c978795a37a5651b427eef0c8ef52220496 (v5.8-1031-ga8f74c978) parent(s): 3ce77681b7cc369e2f5c2a1f83216eb62776065d author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2019-01-28 23:02:33 +0300 message: Don't attempt to free RangeLockMgr::cmp_ if it hasnt been initialized (This happens if we don't use Range Locking. TODO: probably we should not create RangeLockMgr at all in this case) --- utilities/transactions/transaction_lock_mgr.cc | 5 ++++- utilities/transactions/transaction_lock_mgr.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 4c1417630..56f3295fd 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -1007,6 +1007,7 @@ int RangeLockMgr::compare_dbt_endpoints(__toku_db*, void *arg, RangeLockMgr::RangeLockMgr(TransactionDB* txn_db) : my_txn_db(txn_db) { ltm.create(on_create, on_destroy, on_escalate, NULL); lt= nullptr; + cmp_initialized_= false; } @@ -1058,6 +1059,7 @@ RangeLockMgr::set_endpoint_cmp_functions(convert_key_to_endpoint_func cvt_func, assert(!lt); cmp_.create(compare_dbt_endpoints, (void*)this, NULL); + cmp_initialized_ = true; DICTIONARY_ID dict_id = { .dictid = 1 }; lt= ltm.get_lt(dict_id, cmp_, /* on_create_extra*/nullptr); } @@ -1067,7 +1069,8 @@ RangeLockMgr::~RangeLockMgr() { ltm.release_lt(lt); } ltm.destroy(); - cmp_.destroy(); + if (cmp_initialized_) + cmp_.destroy(); } uint64_t RangeLockMgr::get_escalation_count() { diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index 31503c1e4..0c3284519 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -240,6 +240,7 @@ class RangeLockMgr : toku::locktree *lt; // only one tree for now toku::comparator cmp_; + bool cmp_initialized_; // Convert rowkey to endpoint (TODO: shouldn't "rowkey=const" translate into // a pair of [start; end] endpoints in general? They translate into the same

1 0

[Commits] c4f97d3cfa4: Merge branch '5.5' into 10.0
by Oleksandr Byelkin 28 Jan '19

28 Jan '19

revision-id: c4f97d3cfa46a7f1b283926dd7fedb648566283f (mariadb-10.0.37-65-gc4f97d3cfa4) parent(s): 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 eff71f39ddc117d09da5465f7ea9fe007ed89009 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-28 20:52:47 +0100 message: Merge branch '5.5' into 10.0 CMakeLists.txt | 10 +++++++-- client/mysqltest.cc | 2 -- cmake/build_configurations/mysql_release.cmake | 1 - config.h.cmake | 6 +++++- include/mysql.h | 2 +- include/mysql.h.pp | 2 +- mysql-test/disabled.def | 1 + mysql-test/r/mysql.result | 26 ++++++++++++++++++++++ mysql-test/t/mysql.test | 22 +++++++++++++++++++ mysys/my_file.c | 7 +++--- sql-common/client.c | 30 +++++++++++++++++++++++--- 11 files changed, 94 insertions(+), 15 deletions(-) diff --cc CMakeLists.txt index 3b270208a2d,bc4c4e4f103..92c1f9ef060 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -262,11 -254,17 +262,17 @@@ MY_CHECK_C_COMPILER_FLAG(-ggdb3 HAVE_GG IF(HAVE_GGDB3) SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb3") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb3") -ENDIF() +ENDIF(HAVE_GGDB3) - OPTION(ENABLED_LOCAL_INFILE - "If we should should enable LOAD DATA LOCAL by default" ${IF_WIN}) + SET(ENABLED_LOCAL_INFILE "AUTO" CACHE STRING "If we should should enable LOAD DATA LOCAL by default (OFF/ON/AUTO)") MARK_AS_ADVANCED(ENABLED_LOCAL_INFILE) + IF (ENABLED_LOCAL_INFILE MATCHES "^(0|FALSE)$") + SET(ENABLED_LOCAL_INFILE OFF) + ELSEIF(ENABLED_LOCAL_INFILE MATCHES "^(1|TRUE)$") + SET(ENABLED_LOCAL_INFILE ON) + ELSEIF (NOT ENABLED_LOCAL_INFILE MATCHES "^(ON|OFF|AUTO)$") + MESSAGE(FATAL_ERROR "ENABLED_LOCAL_INFILE must be one of OFF, ON, AUTO") + ENDIF() OPTION(WITH_FAST_MUTEXES "Compile with fast mutexes" OFF) MARK_AS_ADVANCED(WITH_FAST_MUTEXES) diff --cc mysql-test/disabled.def index 17bc921ab66,d4856f0b7aa..9292081b45e --- a/mysql-test/disabled.def +++ b/mysql-test/disabled.def @@@ -13,9 -13,6 +13,10 @@@ tablespace : disabled in events_time_zone : Test is not predictable as it depends on precise timing. read_many_rows_innodb : Bug#11748886 2010-11-15 mattiasj report already exists mysql_embedded : Bug#12561297 2011-05-14 Anitha Dependent on PB2 changes - eventum#41836 +#show_explain : Psergey: random timeout in range-checked-for-each record query. +ssl_crl_clients_valid : broken upstream +ssl_crl : broken upstream +ssl_crl_clrpath : broken upstream file_contents : MDEV-6526 these files are not installed anymore lowercase_fs_on : lower_case_table_names=0 is not an error until 10.1 + partition_open_files_limit : open_files_limit check broken by MDEV-18360

1 0

[Commits] 8c2f3e0c16a: Fix detection of version in tokudb
by Oleksandr Byelkin 28 Jan '19

28 Jan '19

revision-id: 8c2f3e0c16a4b9c2961a474f399b88be5ec330d1 (mariadb-10.0.37-64-g8c2f3e0c16a) parent(s): 5cdb3fb25e72d806b53fd7aa65b9320f4270f749 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-28 20:17:54 +0100 message: Fix detection of version in tokudb --- storage/tokudb/PerconaFT/portability/toku_instr_mysql.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/tokudb/PerconaFT/portability/toku_instr_mysql.h b/storage/tokudb/PerconaFT/portability/toku_instr_mysql.h index 695624acd6d..beb833a163c 100644 --- a/storage/tokudb/PerconaFT/portability/toku_instr_mysql.h +++ b/storage/tokudb/PerconaFT/portability/toku_instr_mysql.h @@ -16,7 +16,7 @@ #include "mysql/psi/mysql_thread.h" // PSI_mutex #include "mysql/psi/mysql_stage.h" // PSI_stage -#if (MYSQL_VERSION_ID >= 80000) +#if (MYSQL_VERSION_ID >= 80000) && ( MYSQL_VERSION_ID <= 100000) #include "mysql/psi/mysql_cond.h" #include "mysql/psi/mysql_mutex.h" #include "mysql/psi/mysql_rwlock.h"

1 0

[Commits] 5cdb3fb25e7: Merge branch 'merge-tokudb-5.6' into 10.0
by Oleksandr Byelkin 28 Jan '19

28 Jan '19

revision-id: 5cdb3fb25e72d806b53fd7aa65b9320f4270f749 (mariadb-10.0.37-63-g5cdb3fb25e7) parent(s): 724b09d5e726be612be6154a900bd907897d4124 13802fef831790c4b63a3ddbf96e516eff422464 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-28 20:15:57 +0100 message: Merge branch 'merge-tokudb-5.6' into 10.0 storage/tokudb/PerconaFT/COPYING.APACHEv2 | 174 ++ storage/tokudb/PerconaFT/README.md | 5 +- storage/tokudb/PerconaFT/ft/txn/txn_manager.h | 4 +- .../tokudb/PerconaFT/locktree/concurrent_tree.cc | 14 + .../tokudb/PerconaFT/locktree/concurrent_tree.h | 14 + storage/tokudb/PerconaFT/locktree/keyrange.cc | 13 + storage/tokudb/PerconaFT/locktree/keyrange.h | 13 + storage/tokudb/PerconaFT/locktree/lock_request.cc | 13 + storage/tokudb/PerconaFT/locktree/lock_request.h | 13 + storage/tokudb/PerconaFT/locktree/locktree.cc | 13 + storage/tokudb/PerconaFT/locktree/locktree.h | 13 + storage/tokudb/PerconaFT/locktree/manager.cc | 13 + storage/tokudb/PerconaFT/locktree/range_buffer.cc | 13 + storage/tokudb/PerconaFT/locktree/range_buffer.h | 13 + storage/tokudb/PerconaFT/locktree/treenode.cc | 13 + storage/tokudb/PerconaFT/locktree/treenode.h | 13 + storage/tokudb/PerconaFT/locktree/txnid_set.cc | 13 + storage/tokudb/PerconaFT/locktree/txnid_set.h | 13 + storage/tokudb/PerconaFT/locktree/wfg.cc | 13 + storage/tokudb/PerconaFT/locktree/wfg.h | 13 + .../PerconaFT/portability/toku_instr_mysql.cc | 12 +- .../PerconaFT/portability/toku_instr_mysql.h | 11 +- .../tokudb/PerconaFT/portability/toku_pthread.h | 78 +- storage/tokudb/PerconaFT/util/growable_array.h | 13 + storage/tokudb/PerconaFT/util/omt.cc | 2261 +++++++++++--------- storage/tokudb/PerconaFT/util/omt.h | 13 + storage/tokudb/ha_tokudb.cc | 10 + storage/tokudb/hatoku_hton.cc | 4 +- storage/tokudb/hatoku_hton.h | 1 - .../tokudb/mysql-test/tokudb_bugs/r/PS-4979.result | 2 + .../tokudb/mysql-test/tokudb_bugs/t/PS-4979.test | 12 + storage/tokudb/tokudb_background.cc | 4 +- storage/tokudb/tokudb_sysvars.cc | 14 +- storage/tokudb/tokudb_sysvars.h | 4 +- 34 files changed, 1776 insertions(+), 1069 deletions(-)

1 0

[Commits] 724b09d5e72: Version fix after merge
by Oleksandr Byelkin 28 Jan '19

28 Jan '19

revision-id: 724b09d5e726be612be6154a900bd907897d4124 (mariadb-10.0.37-62-g724b09d5e72) parent(s): 94b68b35f46918fb1e145cad6387c9fcd045c392 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2019-01-28 15:42:16 +0100 message: Version fix after merge --- storage/innobase/include/univ.i | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 5027b9cab5e..f1bf416b370 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -45,7 +45,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 6 -#define INNODB_VERSION_BUGFIX 42 +#define INNODB_VERSION_BUGFIX 43 /* The following is the InnoDB version as shown in SELECT plugin_version FROM information_schema.plugins;

1 0