- commits - lists.mariadb.org

[Commits] 9a8baa6: MDEV-16473 WITH statement throws 'no database selected' error
by IgorBabaev 26 Jun '18

26 Jun '18

revision-id: 9a8baa6829847ee4c4c81a4bf3fd19f7c2e8b103 (mariadb-10.2.15-80-g9a8baa6) parent(s): fe3f9fa9183ea3d10397b6f7f4d422ae9bba00a4 author: Igor Babaev committer: Igor Babaev timestamp: 2018-06-25 19:19:10 -0700 message: MDEV-16473 WITH statement throws 'no database selected' error Before this patch if no default database was set the server threw an error for any table name reference that was not fully qualified by database name. In particular it happened for table names referenced CTE tables. This was incorrect. The error message was thrown at the parser stage when the names referencing different tables were not resolved yet. Now if no default database is set and a with clause is used in the processed statement any table reference is just supplied with a dummy database name "*none*" at the parser stage. Later after a call of check_dependencies_in_with_clauses() when the names for CTE tables can be resolved error messages are thrown only for those names that refer to non-CTE tables. This is done in open_and_process_table(). --- mysql-test/r/cte_nonrecursive.result | 34 ++++++++++++++++++++++++++++++++++ mysql-test/t/cte_nonrecursive.test | 29 ++++++++++++++++++++++++++++- sql/sql_base.cc | 8 ++++++++ sql/sql_class.h | 25 +++++++++++++++++++++---- sql/sql_lex.h | 2 ++ sql/sql_parse.cc | 1 + 6 files changed, 94 insertions(+), 5 deletions(-) diff --git a/mysql-test/r/cte_nonrecursive.result b/mysql-test/r/cte_nonrecursive.result index 1d079c3..f6b8015 100644 --- a/mysql-test/r/cte_nonrecursive.result +++ b/mysql-test/r/cte_nonrecursive.result @@ -1478,3 +1478,37 @@ select 2 as f; f 2 drop table t1; +# +# MDEV-16473: query with CTE when no database is set +# +create database db_mdev_16473; +use db_mdev_16473; +drop database db_mdev_16473; +# Now no default database is set +select database(); +database() +NULL +with cte as (select 1 as a) select * from cte; +a +1 +create database db_mdev_16473; +create table db_mdev_16473.t1 (a int); +insert into db_mdev_16473.t1 values (2), (7), (3), (1); +with cte as (select * from db_mdev_16473.t1) select * from cte; +a +2 +7 +3 +1 +with cte as (select * from db_mdev_16473.t1) +select * from cte, t1 as t where cte.a=t.a; +ERROR 3D000: No database selected +with cte as (select * from db_mdev_16473.t1) +select * from cte, db_mdev_16473.t1 as t where cte.a=t.a; +a a +2 2 +7 7 +3 3 +1 1 +drop database db_mdev_16473; +use test; diff --git a/mysql-test/t/cte_nonrecursive.test b/mysql-test/t/cte_nonrecursive.test index 98a7794..11c864b 100644 --- a/mysql-test/t/cte_nonrecursive.test +++ b/mysql-test/t/cte_nonrecursive.test @@ -1029,4 +1029,31 @@ with cte as select 2 as f; drop table t1; - \ No newline at end of file + +--echo # +--echo # MDEV-16473: query with CTE when no database is set +--echo # + +create database db_mdev_16473; +use db_mdev_16473; +drop database db_mdev_16473; + +--echo # Now no default database is set +select database(); + +with cte as (select 1 as a) select * from cte; + +create database db_mdev_16473; +create table db_mdev_16473.t1 (a int); +insert into db_mdev_16473.t1 values (2), (7), (3), (1); +with cte as (select * from db_mdev_16473.t1) select * from cte; + +--error ER_NO_DB_ERROR +with cte as (select * from db_mdev_16473.t1) +select * from cte, t1 as t where cte.a=t.a; +with cte as (select * from db_mdev_16473.t1) +select * from cte, db_mdev_16473.t1 as t where cte.a=t.a; + +drop database db_mdev_16473; + +use test; diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 9dfaf82..2e57686 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -3330,6 +3330,14 @@ open_and_process_table(THD *thd, LEX *lex, TABLE_LIST *tables, /* Not a placeholder: must be a base/temporary table or a view. Let us open it. */ + + if (tables->db == no_db) + { + my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0)); + error= TRUE; + goto end; + } + if (tables->table) { /* diff --git a/sql/sql_class.h b/sql/sql_class.h index a12015e..cb0893d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3945,11 +3945,28 @@ class THD :public Statement, { if (db == NULL) { - my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0)); - return TRUE; + /* + No default database is set. In this case if it's guaranteed that + no CTE can be used in the statement then we can throw an error right + now at the parser stage. Otherwise the decision about throwing such + a message must be postponed until a post-parser stage when we are able + to resolve all CTE names as we don't need this message to be thrown + for any CTE references. + */ + if (!lex->with_clauses_list) + { + my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0)); + return TRUE; + } + /* This will allow to throw an error later for non-CTE references */ + *p_db= (char *) no_db; + *p_db_length= strlen(no_db); + } + else + { + *p_db= strmake(db, db_length); + *p_db_length= db_length; } - *p_db= strmake(db, db_length); - *p_db_length= db_length; return FALSE; } thd_scheduler event_scheduler; diff --git a/sql/sql_lex.h b/sql/sql_lex.h index a1f6b20..ae010a8 100644 --- a/sql/sql_lex.h +++ b/sql/sql_lex.h @@ -156,6 +156,8 @@ struct LEX_TYPE extern const LEX_STRING null_lex_str; extern const LEX_STRING empty_lex_str; +extern const char *no_db; + enum enum_sp_suid_behaviour { SP_IS_DEFAULT_SUID= 0, diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index a5973b9..0f74755 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -139,6 +139,7 @@ static bool execute_show_status(THD *, TABLE_LIST *); static bool check_rename_table(THD *, TABLE_LIST *, TABLE_LIST *); const char *any_db="*any*"; // Special symbol for check_access +const char *no_db="*none*"; // Used when no default db is set const LEX_STRING command_name[257]={ { C_STRING_WITH_LEN("Sleep") }, //0

1 0

[Commits] 1c288c2: MDEV-16428: Concurrent DML on RocksDB tables makes optimistic parallel replication abort
by psergey＠askmonty.org 25 Jun '18

25 Jun '18

revision-id: 1c288c266e0208e98d55e5348fa78c27517022c9 parent(s): a107c79fcdde80d1dea0a1caf5859647f77b48c9 committer: Sergei Petrunia branch nick: 10.2-r12-new-submodule timestamp: 2018-06-25 23:15:18 +0300 message: MDEV-16428: Concurrent DML on RocksDB tables makes optimistic parallel replication abort DRAFT: Make MyRocks call thd_rpl_deadlock_check(X, Y) whenever a transaction X is about to wait on a row that's locked by transaction Y. This allows the SQL layer to check if transaction Y has "ran ahead" of transaction X and abort it if it is necessary. The patch includes adding a hook into RocksDB to detect the waits. --- .gitmodules | 2 +- storage/rocksdb/ha_rocksdb.cc | 132 ++++++++++++++++++++++++++++++++++++++++++ storage/rocksdb/rocksdb | 2 +- 3 files changed, 134 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6419657..2ef79a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/MariaDB/mariadb-connector-c [submodule "storage/rocksdb/rocksdb"] path = storage/rocksdb/rocksdb - url = https://github.com/facebook/rocksdb.git + url = https://github.com/spetrunia/rocksdb.git diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 96bc7da..bd2e0bf 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -53,6 +53,9 @@ #endif #include <mysys_err.h> +#include "my_sys.h" +#include "lf.h" + // Both MySQL and RocksDB define the same constant. To avoid compilation errors // till we make the fix in RocksDB, we'll temporary undefine it here. #undef CACHE_LINE_SIZE @@ -116,6 +119,101 @@ MYSQL_PLUGIN_IMPORT bool my_disable_leak_check; void ignore_db_dirs_append(const char *dirname_arg); +//////////////////////////////////////////////////////////////////////// + + +/* + A thread-safe, concurrent way to maintain a map from RocksDB's + TransactionIDs to MariaDB's THD*. +*/ + +class Transaction_id_map +{ + typedef rocksdb::TransactionID key_type; + typedef THD* value_type; + + typedef struct + { + key_type key; + value_type val; + } ELEMENT; + + LF_HASH lf_hash; + +public: + void init(); + void cleanup(); + + /* + Before using the LockTable, each thread should get its own "pins". + */ + LF_PINS* get_pins() { return lf_hash_get_pins(&lf_hash); } + void put_pins(LF_PINS *pins) { return lf_hash_put_pins(pins); } + + void put(LF_PINS *pins, key_type key, value_type value); + value_type get(LF_PINS *pins, key_type key); + void remove(LF_PINS *pins, key_type key); +}; + +void Transaction_id_map::init() +{ + lf_hash_init(&lf_hash, + sizeof(ELEMENT), + LF_HASH_UNIQUE, + 0 /* key offset */, + sizeof(key_type)/*key_len*/, NULL /*get_hash_key*/, + NULL /*charset*/); + + lf_hash.alloc.constructor= NULL; + lf_hash.alloc.destructor= NULL; + lf_hash.element_size= sizeof(ELEMENT); +} + + +void Transaction_id_map::cleanup() +{ + DBUG_ASSERT(lf_hash.count == 0); + lf_hash_destroy(&lf_hash); +} + + +void Transaction_id_map::put(LF_PINS *pins, key_type key, value_type value) +{ + ELEMENT new_elem; + new_elem.key= key; + new_elem.val= value; + + /* + The following call may return: + 0: OK + 1: Element already exists (should not happen) + -1: out-of-memory condition. + Dont do error handling as we don't have any way to do it. + */ + lf_hash_insert(&lf_hash, pins, &new_elem); +} + + +void Transaction_id_map::remove(LF_PINS *pins, key_type key) +{ + lf_hash_delete(&lf_hash, pins, &key, sizeof(key_type)); +} + + +Transaction_id_map::value_type Transaction_id_map::get(LF_PINS *pins, key_type key) +{ + ELEMENT *ptr= (ELEMENT*)lf_hash_search(&lf_hash, pins, &key, sizeof(key_type)); + + if (ptr) + return ptr->val; + + return NULL; +} + +Transaction_id_map trx_id_map; +/////////////////////////////////////////////////////////////////////////// + + namespace myrocks { static st_global_stats global_stats; @@ -2492,6 +2590,7 @@ class Rdb_transaction_impl : public Rdb_transaction { rocksdb::Transaction *m_rocksdb_reuse_tx = nullptr; public: + LF_PINS *lf_pins; // LF-hash pins to use with trx_id_map void set_lock_timeout(int timeout_sec_arg) override { if (m_rocksdb_tx) m_rocksdb_tx->SetLockTimeout(rdb_convert_sec_to_ms(m_timeout_sec)); @@ -2555,6 +2654,7 @@ class Rdb_transaction_impl : public Rdb_transaction { release_snapshot(); s = m_rocksdb_tx->Commit(); + trx_id_map.remove(lf_pins, m_rocksdb_tx->GetID()); if (!s.ok()) { rdb_handle_io_error(s, RDB_IO_ERROR_TX_COMMIT); res = true; @@ -2589,6 +2689,7 @@ class Rdb_transaction_impl : public Rdb_transaction { /* This will also release all of the locks: */ m_rocksdb_tx->Rollback(); + trx_id_map.remove(lf_pins, m_rocksdb_tx->GetID()); /* Save the transaction object to be reused */ release_tx(); @@ -2743,6 +2844,8 @@ class Rdb_transaction_impl : public Rdb_transaction { rdb->BeginTransaction(write_opts, tx_opts, m_rocksdb_reuse_tx); m_rocksdb_reuse_tx = nullptr; + trx_id_map.put(lf_pins, m_rocksdb_tx->GetID(), m_thd); + m_read_opts = rocksdb::ReadOptions(); set_initial_savepoint(); @@ -2801,6 +2904,7 @@ class Rdb_transaction_impl : public Rdb_transaction { : Rdb_transaction(thd), m_rocksdb_tx(nullptr) { // Create a notifier that can be called when a snapshot gets generated. m_notifier = std::make_shared<Rdb_snapshot_notifier>(this); + lf_pins= trx_id_map.get_pins(); } virtual ~Rdb_transaction_impl() { @@ -2813,6 +2917,7 @@ class Rdb_transaction_impl : public Rdb_transaction { // Free any transaction memory that is still hanging around. delete m_rocksdb_reuse_tx; + trx_id_map.put_pins(lf_pins); DBUG_ASSERT(m_rocksdb_tx == nullptr); } }; @@ -4131,6 +4236,28 @@ static int rocksdb_start_tx_and_assign_read_view( return HA_EXIT_SUCCESS; } + +/* There is no prototype of this function in any header */ +extern "C" int thd_rpl_deadlock_check(MYSQL_THD thd, MYSQL_THD other_thd); + + +/* A row_wait_callback_t-Compatible function */ +void rdb_row_wait_callback(rocksdb::TransactionID waiter, + rocksdb::TransactionID waitee) +{ + Rdb_transaction *&tx = get_tx_from_thd(current_thd); + + if (!tx->is_writebatch_trx()) { + const auto tx_impl = static_cast<const Rdb_transaction_impl *>(tx); + + THD *waiter_thd= trx_id_map.get(tx_impl->lf_pins, waiter); + THD *waitee_thd= trx_id_map.get(tx_impl->lf_pins, waitee); + //DBUG_ASSERT(waiter_thd == tx->m_thd); + thd_rpl_deadlock_check(waiter_thd, waitee_thd); + } +} + + /* Dummy SAVEPOINT support. This is needed for long running transactions * like mysqldump (https://bugs.mysql.com/bug.php?id=71017) * Current SAVEPOINT does not correctly handle ROLLBACK and does not return @@ -4663,6 +4790,10 @@ static int rocksdb_init_func(void *const p) { Rdb_sst_info::init(rdb); + trx_id_map.init(); + + rdb->SetRowWaitCallback(&rdb_row_wait_callback); + /* Enable auto compaction, things needed for compaction filter are finished initializing @@ -4887,6 +5018,7 @@ static int rocksdb_done_func(void *const p) { delete rdb; rdb = nullptr; + trx_id_map.cleanup(); delete commit_latency_stats; commit_latency_stats = nullptr; diff --git a/storage/rocksdb/rocksdb b/storage/rocksdb/rocksdb index ba295cd..38080be 160000 --- a/storage/rocksdb/rocksdb +++ b/storage/rocksdb/rocksdb @@ -1 +1 @@ -Subproject commit ba295cda29daee3ffe58549542804efdfd969784 +Subproject commit 38080be88bf20e8956754d62322de1c98ab5d736

1 0

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

25 Jun '18

revision-id: 38080be88bf20e8956754d62322de1c98ab5d736 parent(s): ba295cda29daee3ffe58549542804efdfd969784 committer: Sergei Petrunia branch nick: rocksdb-10.2-r12-new-submodule timestamp: 2018-06-25 22:43:23 +0300 message: MDEV-16428: Make optimistic parallel replication work DRAFT PATCH, RocksDB part of it: 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] 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