mirror of
https://github.com/MariaDB/server.git
synced 2025-11-10 23:02:54 +03:00
a7e352b54d
This was done in, among other things: - thd->db and thd->db_length - TABLE_LIST tablename, db, alias and schema_name - Audit plugin database name - lex->db - All db and table names in Alter_table_ctx - st_select_lex db Other things: - Changed a lot of functions to take const LEX_CSTRING* as argument for db, table_name and alias. See init_one_table() as an example. - Changed some function arguments from LEX_CSTRING to const LEX_CSTRING - Changed some lists from LEX_STRING to LEX_CSTRING - threads_mysql.result changed because process list_db wasn't always correctly updated - New append_identifier() function that takes LEX_CSTRING* as arguments - Added new element tmp_buff to Alter_table_ctx to separate temp name handling from temporary space - Ensure we store the length after my_casedn_str() of table/db names - Removed not used version of rename_table_in_stat_tables() - Changed Natural_join_column::table_name and db_name() to never return NULL (used for print) - thd->get_db() now returns db as a printable string (thd->db.str or "")
82 lines
1.9 KiB
C++
82 lines
1.9 KiB
C++
#ifndef VERS_UTILS_INCLUDED
|
|
#define VERS_UTILS_INCLUDED
|
|
|
|
#include "table.h"
|
|
#include "sql_class.h"
|
|
#include "vers_string.h"
|
|
|
|
class MDL_auto_lock
|
|
{
|
|
THD *thd;
|
|
TABLE_LIST &table;
|
|
bool error;
|
|
|
|
public:
|
|
MDL_auto_lock(THD *_thd, TABLE_LIST &_table) :
|
|
thd(_thd), table(_table)
|
|
{
|
|
DBUG_ASSERT(thd);
|
|
MDL_request protection_request;
|
|
if (thd->global_read_lock.can_acquire_protection())
|
|
{
|
|
error= true;
|
|
return;
|
|
}
|
|
protection_request.init(MDL_key::GLOBAL, "", "", MDL_INTENTION_EXCLUSIVE,
|
|
MDL_EXPLICIT);
|
|
error= thd->mdl_context.acquire_lock(&protection_request, thd->variables.lock_wait_timeout);
|
|
if (error)
|
|
return;
|
|
|
|
table.mdl_request.init(MDL_key::TABLE, table.db.str, table.table_name.str, MDL_EXCLUSIVE, MDL_EXPLICIT);
|
|
error= thd->mdl_context.acquire_lock(&table.mdl_request, thd->variables.lock_wait_timeout);
|
|
thd->mdl_context.release_lock(protection_request.ticket);
|
|
}
|
|
~MDL_auto_lock()
|
|
{
|
|
if (!error)
|
|
{
|
|
DBUG_ASSERT(table.mdl_request.ticket);
|
|
thd->mdl_context.release_lock(table.mdl_request.ticket);
|
|
table.mdl_request.ticket= NULL;
|
|
}
|
|
}
|
|
bool acquire_error() const { return error; }
|
|
};
|
|
|
|
|
|
class Local_da : public Diagnostics_area
|
|
{
|
|
THD *thd;
|
|
uint sql_error;
|
|
Diagnostics_area *saved_da;
|
|
|
|
public:
|
|
Local_da(THD *_thd, uint _sql_error= 0) :
|
|
Diagnostics_area(_thd->query_id, false, true),
|
|
thd(_thd),
|
|
sql_error(_sql_error),
|
|
saved_da(_thd->get_stmt_da())
|
|
{
|
|
thd->set_stmt_da(this);
|
|
}
|
|
~Local_da()
|
|
{
|
|
if (saved_da)
|
|
finish();
|
|
}
|
|
void finish()
|
|
{
|
|
DBUG_ASSERT(saved_da && thd);
|
|
thd->set_stmt_da(saved_da);
|
|
if (is_error())
|
|
my_error(sql_error ? sql_error : sql_errno(), MYF(0), message());
|
|
if (warn_count() > error_count())
|
|
saved_da->copy_non_errors_from_wi(thd, get_warning_info());
|
|
saved_da= NULL;
|
|
}
|
|
};
|
|
|
|
|
|
#endif // VERS_UTILS_INCLUDED
|