- commits - lists.mariadb.org

[Commits] 48a492f: MDEV-16428: Make optimistic parallel replication work
by psergey＠askmonty.org 25 Jun '18

25 Jun '18

revision-id: 48a492fb6e345f46483e6a95d382fc106a3bb897 parent(s): ba295cda29daee3ffe58549542804efdfd969784 committer: Sergei Petrunia branch nick: rocksdb-10.2-r12-new-submodule timestamp: 2018-06-25 22:41:09 +0300 message: MDEV-16428: Make optimistic parallel replication work DRAFT PATCH: Add a callback function that is used to inform the SQL layer that transaction X is waiting on a row lock that is held by transaction Y. Optimistic parallel slave uses it to determine that transaction Y has ran ahead of transaction X. If they need to be committed in the other order (first X, then Y), then Y will be rolled back to allow X to proceed (and Y will be retried later on). --- include/rocksdb/utilities/transaction_db.h | 7 +++++++ utilities/transactions/pessimistic_transaction_db.h | 4 ++++ utilities/transactions/transaction_lock_mgr.cc | 15 ++++++++++++++- utilities/transactions/transaction_lock_mgr.h | 3 +++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/include/rocksdb/utilities/transaction_db.h b/include/rocksdb/utilities/transaction_db.h index b5a33d1..1d5d3dd 100644 --- a/include/rocksdb/utilities/transaction_db.h +++ b/include/rocksdb/utilities/transaction_db.h @@ -156,6 +156,11 @@ struct DeadlockPath { bool empty() { return path.empty() && !limit_exceeded; } }; + +typedef void (*row_wait_callback_t)(rocksdb::TransactionID waiter, + rocksdb::TransactionID waitee); + + class TransactionDB : public StackableDB { public: // Open a TransactionDB similar to DB::Open(). @@ -217,6 +222,8 @@ class TransactionDB : public StackableDB { virtual std::vector<DeadlockPath> GetDeadlockInfoBuffer() = 0; virtual void SetDeadlockInfoBufferSize(uint32_t target_size) = 0; + virtual void SetRowWaitCallback(row_wait_callback_t callback) {} + protected: // To Create an TransactionDB, call Open() explicit TransactionDB(DB* db) : StackableDB(db) {} diff --git a/utilities/transactions/pessimistic_transaction_db.h b/utilities/transactions/pessimistic_transaction_db.h index 4311e88..8a47cbd 100644 --- a/utilities/transactions/pessimistic_transaction_db.h +++ b/utilities/transactions/pessimistic_transaction_db.h @@ -113,6 +113,10 @@ class PessimisticTransactionDB : public TransactionDB { std::vector<DeadlockPath> GetDeadlockInfoBuffer() override; void SetDeadlockInfoBufferSize(uint32_t target_size) override; + virtual void SetRowWaitCallback(row_wait_callback_t callback) override { + lock_mgr_.SetRowWaitCallback(callback); + } + protected: DBImpl* db_impl_; std::shared_ptr<Logger> info_log_; diff --git a/utilities/transactions/transaction_lock_mgr.cc b/utilities/transactions/transaction_lock_mgr.cc index 9485067..e6593b0 100644 --- a/utilities/transactions/transaction_lock_mgr.cc +++ b/utilities/transactions/transaction_lock_mgr.cc @@ -173,7 +173,8 @@ TransactionLockMgr::TransactionLockMgr( max_num_locks_(max_num_locks), lock_maps_cache_(new ThreadLocalPtr(&UnrefLockMapsCache)), dlock_buffer_(max_num_deadlocks), - mutex_factory_(mutex_factory) { + mutex_factory_(mutex_factory), + row_wait_callback(NULL) { assert(txn_db); txn_db_impl_ = static_cast_with_check<PessimisticTransactionDB, TransactionDB>(txn_db); @@ -383,6 +384,18 @@ Status TransactionLockMgr::AcquireWithTimeout( } TEST_SYNC_POINT("TransactionLockMgr::AcquireWithTimeout:WaitingTxn"); + + //psergey: Call the MariaDB callback to inform it that + // transaction X is doing a row lock wait for a lock that + // is held by transaction Y. + // + // Transaction Y + if (row_wait_callback) + { + for (auto it= wait_ids.begin(); it != wait_ids.end(); it++) + row_wait_callback(txn->GetID(), *it); + } + if (cv_end_time < 0) { // Wait indefinitely result = stripe->stripe_cv->Wait(stripe->stripe_mutex); diff --git a/utilities/transactions/transaction_lock_mgr.h b/utilities/transactions/transaction_lock_mgr.h index abf7c5d..86a9904 100644 --- a/utilities/transactions/transaction_lock_mgr.h +++ b/utilities/transactions/transaction_lock_mgr.h @@ -84,6 +84,8 @@ class TransactionLockMgr { std::vector<DeadlockPath> GetDeadlockInfoBuffer(); void Resize(uint32_t); + void SetRowWaitCallback(row_wait_callback_t callback) { row_wait_callback= callback; } + private: PessimisticTransactionDB* txn_db_impl_; @@ -149,6 +151,7 @@ class TransactionLockMgr { void DecrementWaitersImpl(const PessimisticTransaction* txn, const autovector<TransactionID>& wait_ids); + row_wait_callback_t row_wait_callback; // No copying allowed TransactionLockMgr(const TransactionLockMgr&); void operator=(const TransactionLockMgr&);

1 0

[Commits] 0c693dc0c5f: Make test stable (order of tracking variables is guaratied)
by Oleksandr Byelkin 25 Jun '18

25 Jun '18

revision-id: 0c693dc0c5f3933f559d61e32896586841a969e3 (mariadb-10.2.15-100-g0c693dc0c5f) parent(s): cb784e17512588242c953a9f5362b82f1226891a author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 19:01:25 +0200 message: Make test stable (order of tracking variables is guaratied) --- mysql-test/r/mysqltest_tracking_info.result | 24 ++++-------------------- mysql-test/t/mysqltest_tracking_info.test | 4 ++-- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/mysql-test/r/mysqltest_tracking_info.result b/mysql-test/r/mysqltest_tracking_info.result index b5885a37cde..df966ae1d39 100644 --- a/mysql-test/r/mysqltest_tracking_info.result +++ b/mysql-test/r/mysqltest_tracking_info.result @@ -1,46 +1,30 @@ -SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; -@@session.character_set_client @@session.character_set_results @@session.character_set_connection -latin1 latin1 latin1 -SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; +SELECT @@session.character_set_connection; +@@session.character_set_connection +latin1 +SET @@session.session_track_system_variables='character_set_connection'; # tracking info on SET NAMES 'utf8'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- utf8 -- character_set_connection -- utf8 --- character_set_results --- utf8 SET NAMES 'big5'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- big5 -- character_set_connection -- big5 --- character_set_results --- big5 # tracking info on once SET NAMES 'utf8'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- utf8 -- character_set_connection -- utf8 --- character_set_results --- utf8 SET NAMES 'big5'; # tracking info on SET NAMES 'utf8'; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES --- character_set_client --- utf8 -- character_set_connection -- utf8 --- character_set_results --- utf8 # tracking info off once SET NAMES 'big5'; diff --git a/mysql-test/t/mysqltest_tracking_info.test b/mysql-test/t/mysqltest_tracking_info.test index c32e20703a5..d31f68b3cbd 100644 --- a/mysql-test/t/mysqltest_tracking_info.test +++ b/mysql-test/t/mysqltest_tracking_info.test @@ -2,8 +2,8 @@ --source include/no_protocol.inc --source include/not_embedded.inc -SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; -SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; +SELECT @@session.character_set_connection; +SET @@session.session_track_system_variables='character_set_connection'; --echo # tracking info on --enable_session_track_info

1 0

[Commits] 1ace3b3fad9: Mark embedded library as deinited.
by Oleksandr Byelkin 25 Jun '18

25 Jun '18

revision-id: 1ace3b3fad9e9707563cab9762d35e0dcb121b32 (mariadb-10.3.7-62-g1ace3b3fad9) parent(s): 69b9ed063b78d2bf28ec0a4823e0b0317fce2c4d author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 14:50:36 +0200 message: Mark embedded library as deinited. --- libmysqld/lib_sql.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index dd111d1b224..715f1dde5b5 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -654,6 +654,7 @@ void end_embedded_server() copy_arguments_ptr=0; clean_up(0); clean_up_mutexes(); + mysql_embedded_init= 0; } }

1 0

[Commits] cf5444c4260: fix test by builtbot run resul
by Oleksandr Byelkin 25 Jun '18

25 Jun '18

revision-id: cf5444c42600b67a8e7253933042870d3a364aa0 (mariadb-10.2.15-73-gcf5444c4260) parent(s): 63274c3839af750b4ec7b00a1d733fee32d05026 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 13:18:30 +0200 message: fix test by builtbot run resul --- mysql-test/r/session_tracker_last_gtid.result | 15 ++++++++------- mysql-test/t/session_tracker_last_gtid.test | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mysql-test/r/session_tracker_last_gtid.result b/mysql-test/r/session_tracker_last_gtid.result index 6ed850d4ff5..795d0aaa2a2 100644 --- a/mysql-test/r/session_tracker_last_gtid.result +++ b/mysql-test/r/session_tracker_last_gtid.result @@ -1,33 +1,34 @@ # # MDEV-15477: SESSION_SYSVARS_TRACKER does not track last_gtid # +SET gtid_seq_no=1000; SET @@session.session_track_system_variables='last_gtid'; create table t1 (a int) engine=innodb; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES -- last_gtid --- 0-1-1 +-- 0-1-1000 select @@last_gtid; @@last_gtid -0-1-1 +0-1-1000 -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES -- last_gtid --- 0-1-1 +-- 0-1-1000 insert into t1 values (1); -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES -- last_gtid --- 0-1-2 +-- 0-1-1001 select @@last_gtid; @@last_gtid -0-1-2 +0-1-1001 -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES -- last_gtid --- 0-1-2 +-- 0-1-1001 drop table t1; -- Tracker : SESSION_TRACK_SYSTEM_VARIABLES -- last_gtid --- 0-1-3 +-- 0-1-1002 diff --git a/mysql-test/t/session_tracker_last_gtid.test b/mysql-test/t/session_tracker_last_gtid.test index ccd2c25b31f..24cf2104a0c 100644 --- a/mysql-test/t/session_tracker_last_gtid.test +++ b/mysql-test/t/session_tracker_last_gtid.test @@ -1,4 +1,4 @@ - +--source include/not_embedded.inc --source include/have_innodb.inc --source include/have_binlog_format_statement.inc @@ -8,6 +8,7 @@ --echo # MDEV-15477: SESSION_SYSVARS_TRACKER does not track last_gtid --echo # +SET gtid_seq_no=1000; SET @@session.session_track_system_variables='last_gtid'; create table t1 (a int) engine=innodb; select @@last_gtid;

1 0

[Commits] 2df2b86fe75: embedded server client is inherited from old library and do not suport new feature
by Oleksandr Byelkin 25 Jun '18

25 Jun '18

revision-id: 2df2b86fe753cf7d07baacfff6d586fbc64d5e25 (mariadb-10.2.15-73-g2df2b86fe75) parent(s): 1530e7c4287f757706bd12745a7f3f50742ebf78 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 11:00:37 +0200 message: embedded server client is inherited from old library and do not suport new feature --- client/mysqltest.cc | 7 +++++++ mysql-test/t/mysqltest_tracking_info.test | 1 + mysql-test/t/reset_connection.test | 2 ++ 3 files changed, 10 insertions(+) diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 166090a841a..7eb7b8ec118 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6520,6 +6520,7 @@ void do_delimiter(struct st_command* command) static void do_reset_connection() { +#ifndef EMBEDDED_LIBRARY MYSQL *mysql = cur_con->mysql; DBUG_ENTER("do_reset_connection"); @@ -6531,6 +6532,10 @@ static void do_reset_connection() cur_con->stmt= NULL; } DBUG_VOID_RETURN; +#else + die("reset connection failed: unsupported by embedded server client library"); + return; +#endif } @@ -7797,6 +7802,7 @@ void append_info(DYNAMIC_STRING *ds, ulonglong affected_rows, static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql) { +#ifndef EMBEDDED_LIBRARY for (unsigned int type= SESSION_TRACK_BEGIN; type <= SESSION_TRACK_END; type++) { const char *data; @@ -7847,6 +7853,7 @@ static void append_session_track_info(DYNAMIC_STRING *ds, MYSQL *mysql) } dynstr_append(ds, "\n\n"); } +#endif /* EMBEDDED_LIBRARY */ } diff --git a/mysql-test/t/mysqltest_tracking_info.test b/mysql-test/t/mysqltest_tracking_info.test index 9853e50d9d5..c32e20703a5 100644 --- a/mysql-test/t/mysqltest_tracking_info.test +++ b/mysql-test/t/mysqltest_tracking_info.test @@ -1,5 +1,6 @@ --source include/no_protocol.inc +--source include/not_embedded.inc SELECT @@session.character_set_client, @@session.character_set_results, @@session.character_set_connection; SET @@session.session_track_system_variables='character_set_client,character_set_results,character_set_connection'; diff --git a/mysql-test/t/reset_connection.test b/mysql-test/t/reset_connection.test index 39465677483..49f41c32fc3 100644 --- a/mysql-test/t/reset_connection.test +++ b/mysql-test/t/reset_connection.test @@ -1,3 +1,5 @@ +--source include/not_embedded.inc + FLUSH STATUS; --disable_result_log

1 0

[Commits] acb0492b3de: fix embedded server
by Oleksandr Byelkin 25 Jun '18

25 Jun '18

revision-id: acb0492b3de19bb30d0d169367052905cd3abf93 (mariadb-10.2.15-73-gacb0492b3de) parent(s): ba9f6f7fe3155b94c97489b8c32f409beac2b4f1 author: Oleksandr Byelkin committer: Oleksandr Byelkin timestamp: 2018-06-25 10:12:49 +0200 message: fix embedded server --- sql/sql_class.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d2959b0dac5..524522c642a 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -7071,14 +7071,18 @@ THD::signal_wakeup_ready() void THD::set_last_commit_gtid(rpl_gtid &gtid) { +#ifndef EMBEDDED_LIBRARY bool changed_gtid= (m_last_commit_gtid.seq_no != gtid.seq_no); +#endif m_last_commit_gtid= gtid; +#ifndef EMBEDDED_LIBRARY if (changed_gtid && session_tracker.get_tracker(SESSION_SYSVARS_TRACKER)->is_enabled()) { session_tracker.get_tracker(SESSION_SYSVARS_TRACKER)-> mark_as_changed(this, (LEX_CSTRING*)Sys_last_gtid_ptr); } +#endif } void

1 0

[Commits] 6be8bd6: MDEV-15890 Strange error message if you try to FLUSH TABLES <view> after LOCK TABLES <view>.
by holyfoot＠askmonty.org 24 Jun '18

24 Jun '18

revision-id: 6be8bd6ee05c6f18b6a6a0375f9bc2b68ef6c43e (mariadb-10.3.7-59-g6be8bd6) parent(s): 1abd877e2df9e83bc1c2f5195796f427a35bd3f1 committer: Alexey Botchkov timestamp: 2018-06-24 23:12:20 +0400 message: MDEV-15890 Strange error message if you try to FLUSH TABLES <view> after LOCK TABLES <view>. Check if the argument of the FLUSH TABLE is a VIEW and handle it accordingly. --- mysql-test/main/flush.result | 12 ++++ mysql-test/main/flush.test | 14 +++++ sql/sql_base.cc | 142 +++++++++++++++++++++++++++---------------- sql/sql_base.h | 3 +- sql/sql_reload.cc | 14 ++++- sql/sql_table.cc | 2 +- sql/sql_trigger.cc | 2 +- sql/sql_truncate.cc | 2 +- 8 files changed, 131 insertions(+), 60 deletions(-) diff --git a/mysql-test/main/flush.result b/mysql-test/main/flush.result index 5cd4fde..0532136 100644 --- a/mysql-test/main/flush.result +++ b/mysql-test/main/flush.result @@ -542,3 +542,15 @@ flush relay logs,relay logs; ERROR HY000: Incorrect usage of FLUSH and RELAY LOGS flush slave,slave; ERROR HY000: Incorrect usage of FLUSH and SLAVE +# +# MDEV-15890 Strange error message if you try to +# FLUSH TABLES <view> after LOCK TABLES <view>. +# +CREATE TABLE t1 (qty INT, price INT); +CREATE VIEW v1 AS SELECT qty, price, qty*price AS value FROM t1; +LOCK TABLES v1 READ; +FLUSH TABLES v1; +ERROR HY000: Table 't1' was locked with a READ lock and can't be updated +UNLOCK TABLES; +DROP VIEW v1; +DROP TABLE t1; diff --git a/mysql-test/main/flush.test b/mysql-test/main/flush.test index 81834b7..e14c8c3 100644 --- a/mysql-test/main/flush.test +++ b/mysql-test/main/flush.test @@ -673,3 +673,17 @@ DROP TABLE t1; flush relay logs,relay logs; --error ER_WRONG_USAGE flush slave,slave; +--echo # +--echo # MDEV-15890 Strange error message if you try to +--echo # FLUSH TABLES <view> after LOCK TABLES <view>. +--echo # + +CREATE TABLE t1 (qty INT, price INT); +CREATE VIEW v1 AS SELECT qty, price, qty*price AS value FROM t1; +LOCK TABLES v1 READ; +--error ER_TABLE_NOT_LOCKED_FOR_WRITE +FLUSH TABLES v1; +UNLOCK TABLES; +DROP VIEW v1; +DROP TABLE t1; + diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 80939cb..8a6a509 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -414,9 +414,10 @@ bool close_cached_tables(THD *thd, TABLE_LIST *tables, for (TABLE_LIST *table_list= tables_to_reopen; table_list; table_list= table_list->next_global) { + int err; /* A check that the table was locked for write is done by the caller. */ TABLE *table= find_table_for_mdl_upgrade(thd, table_list->db.str, - table_list->table_name.str, TRUE); + table_list->table_name.str, &err); /* May return NULL if this table has already been closed via an alias. */ if (! table) @@ -1493,6 +1494,67 @@ static int set_partitions_as_used(TABLE_LIST *tl, TABLE *t) /** + Check if the given table is actually a VIEW that was LOCK-ed + + @param thd Thread context. + @param t Table to check. + + @retval TRUE The 't'-table is a locked view + needed to remedy problem before retrying again. + @retval FALSE 't' was not locked, not a VIEW or an error happened. +*/ +bool is_locked_view(THD *thd, TABLE_LIST *t) +{ + DBUG_ENTER("check_locked_view"); + /* + Is this table a view and not a base table? + (it is work around to allow to open view with locked tables, + real fix will be made after definition cache will be made) + + Since opening of view which was not explicitly locked by LOCK + TABLES breaks metadata locking protocol (potentially can lead + to deadlocks) it should be disallowed. + */ + if (thd->mdl_context.is_lock_owner(MDL_key::TABLE, + t->db.str, + t->table_name.str, + MDL_SHARED)) + { + char path[FN_REFLEN + 1]; + build_table_filename(path, sizeof(path) - 1, + t->db.str, t->table_name.str, reg_ext, 0); + /* + Note that we can't be 100% sure that it is a view since it's + possible that we either simply have not found unused TABLE + instance in THD::open_tables list or were unable to open table + during prelocking process (in this case in theory we still + should hold shared metadata lock on it). + */ + if (dd_frm_is_view(thd, path)) + { + /* + If parent_l of the table_list is non null then a merge table + has this view as child table, which is not supported. + */ + if (t->parent_l) + { + my_error(ER_WRONG_MRG_TABLE, MYF(0)); + DBUG_RETURN(FALSE); + } + + if (!tdc_open_view(thd, t, CHECK_METADATA_VERSION)) + { + DBUG_ASSERT(t->view != 0); + DBUG_RETURN(TRUE); // VIEW + } + } + } + + DBUG_RETURN(FALSE); +} + + +/** Open a base table. @param thd Thread context. @@ -1640,49 +1702,10 @@ bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx) #endif goto reset; } - /* - Is this table a view and not a base table? - (it is work around to allow to open view with locked tables, - real fix will be made after definition cache will be made) - Since opening of view which was not explicitly locked by LOCK - TABLES breaks metadata locking protocol (potentially can lead - to deadlocks) it should be disallowed. - */ - if (thd->mdl_context.is_lock_owner(MDL_key::TABLE, - table_list->db.str, - table_list->table_name.str, - MDL_SHARED)) - { - char path[FN_REFLEN + 1]; - build_table_filename(path, sizeof(path) - 1, - table_list->db.str, table_list->table_name.str, reg_ext, 0); - /* - Note that we can't be 100% sure that it is a view since it's - possible that we either simply have not found unused TABLE - instance in THD::open_tables list or were unable to open table - during prelocking process (in this case in theory we still - should hold shared metadata lock on it). - */ - if (dd_frm_is_view(thd, path)) - { - /* - If parent_l of the table_list is non null then a merge table - has this view as child table, which is not supported. - */ - if (table_list->parent_l) - { - my_error(ER_WRONG_MRG_TABLE, MYF(0)); - DBUG_RETURN(true); - } + if (is_locked_view(thd, table_list)) + DBUG_RETURN(FALSE); // VIEW - if (!tdc_open_view(thd, table_list, CHECK_METADATA_VERSION)) - { - DBUG_ASSERT(table_list->view != 0); - DBUG_RETURN(FALSE); // VIEW - } - } - } /* No table in the locked tables list. In case of explicit LOCK TABLES this can happen if a user did not include the table into the list. @@ -2052,8 +2075,9 @@ TABLE *find_locked_table(TABLE *list, const char *db, const char *table_name) @param thd Thread context @param db Database name. @param table_name Name of table. - @param no_error Don't emit error if no suitable TABLE - instance were found. + @param p_error In the case of an error (when the function returns NULL) + the error number is stored there. + If the p_error is NULL, function launches the error itself. @note This function checks if the connection holds a global IX metadata lock. If no such lock is found, it is not safe to @@ -2066,15 +2090,15 @@ TABLE *find_locked_table(TABLE *list, const char *db, const char *table_name) */ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, - const char *table_name, bool no_error) + const char *table_name, int *p_error) { TABLE *tab= find_locked_table(thd->open_tables, db, table_name); + int error; if (unlikely(!tab)) { - if (!no_error) - my_error(ER_TABLE_NOT_LOCKED, MYF(0), table_name); - return NULL; + error= ER_TABLE_NOT_LOCKED; + goto err_exit; } /* @@ -2086,9 +2110,8 @@ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, if (unlikely(!thd->mdl_context.is_lock_owner(MDL_key::GLOBAL, "", "", MDL_INTENTION_EXCLUSIVE))) { - if (!no_error) - my_error(ER_TABLE_NOT_LOCKED_FOR_WRITE, MYF(0), table_name); - return NULL; + error= ER_TABLE_NOT_LOCKED_FOR_WRITE; + goto err_exit; } while (tab->mdl_ticket != NULL && @@ -2096,10 +2119,21 @@ TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, (tab= find_locked_table(tab->next, db, table_name))) continue; - if (unlikely(!tab && !no_error)) - my_error(ER_TABLE_NOT_LOCKED_FOR_WRITE, MYF(0), table_name); + if (unlikely(!tab)) + { + error= ER_TABLE_NOT_LOCKED_FOR_WRITE; + goto err_exit; + } return tab; + +err_exit: + if (p_error) + *p_error= error; + else + my_error(error, MYF(0), table_name); + + return NULL; } @@ -3905,7 +3939,7 @@ open_tables_check_upgradable_mdl(THD *thd, TABLE_LIST *tables_start, Note that find_table_for_mdl_upgrade() will report an error if no suitable ticket is found. */ - if (!find_table_for_mdl_upgrade(thd, table->db.str, table->table_name.str, false)) + if (!find_table_for_mdl_upgrade(thd, table->db.str, table->table_name.str, NULL)) return TRUE; } diff --git a/sql/sql_base.h b/sql/sql_base.h index 01892c0..d4d9428 100644 --- a/sql/sql_base.h +++ b/sql/sql_base.h @@ -125,6 +125,7 @@ TABLE *open_ltable(THD *thd, TABLE_LIST *table_list, thr_lock_type update, MYSQL_OPEN_GET_NEW_TABLE |\ MYSQL_OPEN_HAS_MDL_LOCK) +bool is_locked_view(THD *thd, TABLE_LIST *t); bool open_table(THD *thd, TABLE_LIST *table_list, Open_table_context *ot_ctx); bool get_key_map_from_key_list(key_map *map, TABLE *table, @@ -299,7 +300,7 @@ bool tdc_open_view(THD *thd, TABLE_LIST *table_list, uint flags); TABLE *find_table_for_mdl_upgrade(THD *thd, const char *db, const char *table_name, - bool no_error); + int *p_error); int dynamic_column_error_message(enum_dyncol_func_result rc); diff --git a/sql/sql_reload.cc b/sql/sql_reload.cc index 9bcb9a3..c9d854e 100644 --- a/sql/sql_reload.cc +++ b/sql/sql_reload.cc @@ -30,6 +30,7 @@ #include "sql_show.h" #include "debug_sync.h" #include "des_key_file.h" +#include "sql_view.h" #include "transaction.h" static void disable_checkpoints(THD *thd); @@ -289,9 +290,18 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options, */ if (tables) { + int err; for (TABLE_LIST *t= tables; t; t= t->next_local) - if (!find_table_for_mdl_upgrade(thd, t->db.str, t->table_name.str, false)) - return 1; + if (!find_table_for_mdl_upgrade(thd, t->db.str, t->table_name.str, &err)) + { + if (is_locked_view(thd, t)) + t->next_local= t->next_global; + else + { + my_error(err, MYF(0), t->table_name); + return 1; + } + } } else { diff --git a/sql/sql_table.cc b/sql/sql_table.cc index ac65fbb..f39ddce 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -2113,7 +2113,7 @@ bool mysql_rm_table(THD *thd,TABLE_LIST *tables, bool if_exists, in its elements. */ table->table= find_table_for_mdl_upgrade(thd, table->db.str, - table->table_name.str, false); + table->table_name.str, NULL); if (!table->table) DBUG_RETURN(true); table->mdl_request.ticket= table->table->mdl_ticket; diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index df3a2dc..dfc8cfd 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -543,7 +543,7 @@ bool mysql_create_or_drop_trigger(THD *thd, TABLE_LIST *tables, bool create) /* Under LOCK TABLES we must only accept write locked tables. */ if (!(tables->table= find_table_for_mdl_upgrade(thd, tables->db.str, tables->table_name.str, - FALSE))) + NULL))) goto end; } else diff --git a/sql/sql_truncate.cc b/sql/sql_truncate.cc index cf91d6d..09d6e98 100644 --- a/sql/sql_truncate.cc +++ b/sql/sql_truncate.cc @@ -299,7 +299,7 @@ bool Sql_cmd_truncate_table::lock_table(THD *thd, TABLE_LIST *table_ref, if (thd->locked_tables_mode) { if (!(table= find_table_for_mdl_upgrade(thd, table_ref->db.str, - table_ref->table_name.str, FALSE))) + table_ref->table_name.str, NULL))) DBUG_RETURN(TRUE); *hton_can_recreate= ha_check_storage_engine_flag(table->file->ht,

1 0

[Commits] Fix rpl_rotate_logs
by Sachin Setiya 24 Jun '18

24 Jun '18

commit 83b5450b9050d07d4c4a10b2d8e15b9a03161c4b Author: Sachin <sachin.setiya(a)mariadb.com> Date: Sun Jun 24 17:23:41 2018 +0530 Fix rpl_rotate_logs First we have to remove master.info file (cleanup) and second we have to call reset slave all because if we do not call reset slave all then we wont read master.info file beacuse we already have master config in memory. And this makes start slave to pass , which shoud fail becuase its permision is 000 diff --git a/mysql-test/suite/rpl/r/rpl_rotate_logs.result b/mysql-test/suite/rpl/r/rpl_rotate_logs.result index 82f6f537329..2518b207111 100644 --- a/mysql-test/suite/rpl/r/rpl_rotate_logs.result +++ b/mysql-test/suite/rpl/r/rpl_rotate_logs.result @@ -128,4 +128,6 @@ show binlog events in ''; ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log purge master logs before now(); End of 5.0 tests +#cleanup include/stop_slave.inc +reset slave all; diff --git a/mysql-test/suite/rpl/t/rpl_rotate_logs.test b/mysql-test/suite/rpl/t/rpl_rotate_logs.test index 358c0be5b3b..0d65a05bf50 100644 --- a/mysql-test/suite/rpl/t/rpl_rotate_logs.test +++ b/mysql-test/suite/rpl/t/rpl_rotate_logs.test @@ -193,4 +193,8 @@ show binlog events in ''; purge master logs before now(); --echo End of 5.0 tests +--echo #cleanup + +--remove_file $MYSQLD_SLAVE_DATADIR/master.info --source include/stop_slave.inc +reset slave all;

1 0

[Commits] Fix rpl_ip_mix rpl_ip_mix2
by Sachin Setiya 24 Jun '18

24 Jun '18

commit 133c1aad8d75d59cfb68ab08c794a5934d70f304 Author: Sachin <sachin.setiya(a)mariadb.com> Date: Sun Jun 24 17:19:05 2018 +0530 Fix rpl_ip_mix rpl_ip_mix2 We should call reset slave all because we also want to reset master_host otherwise show slave status wont be empty and making repeat N a failure. diff --git a/mysql-test/suite/rpl/r/rpl_ip_mix.result b/mysql-test/suite/rpl/r/rpl_ip_mix.result index e139f863c8a..cc11f481991 100644 --- a/mysql-test/suite/rpl/r/rpl_ip_mix.result +++ b/mysql-test/suite/rpl/r/rpl_ip_mix.result @@ -64,3 +64,5 @@ Master-Host: 127.0.0.1 change master to master_host='0:0:0:0:0:0:0:1'; Master-Host: 0:0:0:0:0:0:0:1 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root'; +connection slave; +reset slave all; diff --git a/mysql-test/suite/rpl/r/rpl_ip_mix2.result b/mysql-test/suite/rpl/r/rpl_ip_mix2.result index 70599d097a7..d304eff9ab4 100644 --- a/mysql-test/suite/rpl/r/rpl_ip_mix2.result +++ b/mysql-test/suite/rpl/r/rpl_ip_mix2.result @@ -64,3 +64,5 @@ Master-Host: 127.0.0.1 change master to master_host='0:0:0:0:0:0:0:1'; Master-Host: 0:0:0:0:0:0:0:1 CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root'; +connection slave; +reset slave all; diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix.test b/mysql-test/suite/rpl/t/rpl_ip_mix.test index 3ddbd598334..63c5fa9251c 100644 --- a/mysql-test/suite/rpl/t/rpl_ip_mix.test +++ b/mysql-test/suite/rpl/t/rpl_ip_mix.test @@ -44,3 +44,5 @@ let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1); # clean up CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root'; +--connection slave +reset slave all; diff --git a/mysql-test/suite/rpl/t/rpl_ip_mix2.test b/mysql-test/suite/rpl/t/rpl_ip_mix2.test index feaf4af44cf..3fff54e52bf 100644 --- a/mysql-test/suite/rpl/t/rpl_ip_mix2.test +++ b/mysql-test/suite/rpl/t/rpl_ip_mix2.test @@ -45,3 +45,5 @@ let $master_host= query_get_value(SHOW SLAVE STATUS, Master_Host, 1); # clean up CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_USER='root'; +connection slave; +reset slave all;

1 0

[Commits] Fix rpl_row_find_row_debug
by Sachin Setiya 24 Jun '18

24 Jun '18

commit 5698fda69464c6bd913566a2ef7b20d06b5f223c Author: Sachin <sachin.setiya(a)mariadb.com> Date: Sun Jun 24 12:15:56 2018 +0530 Fix rpl_row_find_row_debug Instead of looking for absolute value of upd_count , del_count we look for delta. Since we have to store data , we are writing this into a rpl_row_find_row_debug.txt file. diff --git a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test index fb7491b0077..5f3722d4d1d 100644 --- a/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test +++ b/mysql-test/suite/rpl/t/rpl_row_find_row_debug.test @@ -24,7 +24,21 @@ if(!$log_error_) # Assign env variable LOG_ERROR let LOG_ERROR=$log_error_; - +let FILE_STORAGE= $MYSQLTEST_VARDIR/log/rpl_find_row_debug.txt; +perl; + use strict; + my $temp_storage= $ENV{'FILE_STORAGE'} or die "FILE_STORAGE not set"; + open(my $STORAGE,'>', "$temp_storage") or die("Unable to open $temp_storage: $!\n"); + my $log_error= $ENV{'LOG_ERROR'} or die "LOG_ERROR not set"; + open(LOG, "$log_error") or die("Unable to open $log_error: $!\n"); + my $upd_count = () = grep(/The slave is applying a ROW event on behalf of an UPDATE statement on table t1 and is currently taking a considerable amount/g,<LOG>); + seek(LOG, 0, 0) or die "Can't seek to beginning of file: $!"; + my $del_count = () = grep(/The slave is applying a ROW event on behalf of a DELETE statement on table t1 and is currently taking a considerable amount/g,<LOG>); + print $STORAGE "$upd_count\n"; + print $STORAGE "$del_count\n"; + close(STORAGE); + close(LOG); +EOF # force printing the notes to the error log SET GLOBAL debug_dbug="d,inject_long_find_row_note"; --source include/start_slave.inc @@ -44,13 +58,24 @@ DROP TABLE t1; --echo # Check if any note related to long DELETE_ROWS and UPDATE_ROWS appears in the error log perl; use strict; + my $temp_storage= $ENV{'FILE_STORAGE'} or die "FILE_STORAGE not set"; + open(my $STORAGE, '<', "$temp_storage") or die("Unable to open $temp_storage: $!\n"); my $log_error= $ENV{'LOG_ERROR'} or die "LOG_ERROR not set"; - open(FILE, "$log_error") or die("Unable to open $log_error: $!\n"); - my $upd_count = () = grep(/The slave is applying a ROW event on behalf of an UPDATE statement on table t1 and is currently taking a considerable amount/g,<FILE>); - seek(FILE, 0, 0) or die "Can't seek to beginning of file: $!"; - my $del_count = () = grep(/The slave is applying a ROW event on behalf of a DELETE statement on table t1 and is currently taking a considerable amount/g,<FILE>); + open(LOG, "$log_error") or die("Unable to open $log_error: $!\n"); + my $upd_count = () = grep(/The slave is applying a ROW event on behalf of an UPDATE statement on table t1 and is currently taking a considerable amount/g,<LOG>); + seek(LOG, 0, 0) or die "Can't seek to beginning of file: $!"; + my $del_count = () = grep(/The slave is applying a ROW event on behalf of a DELETE statement on table t1 and is currently taking a considerable amount/g,<LOG>); + my $row= <$STORAGE>; + chomp $row; + my $initial_upd_count= $row; + $row= <$STORAGE>; + chomp $row; + my $initial_del_count= $row; + $upd_count= $upd_count - $initial_upd_count; + $del_count= $del_count - $initial_del_count; print "Occurrences: update=$upd_count, delete=$del_count\n"; - close(FILE); + close(LOG); + close(STORAGE); EOF # cleanup

1 0