mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Add Statement::sql_command_flags() function.
Now one can call thd->sql_command_flags() instead of sql_command_flags[thd->lex->sql_command].
This commit is contained in:
committed by
Oleksandr Byelkin
parent
4246c0fa01
commit
62d35a074f
@@ -1341,7 +1341,7 @@ void THD::update_stats(void)
|
||||
/* A SQL query. */
|
||||
if (lex->sql_command == SQLCOM_SELECT)
|
||||
select_commands++;
|
||||
else if (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND)
|
||||
else if (sql_command_flags() & CF_STATUS_COMMAND)
|
||||
{
|
||||
/* Ignore 'SHOW ' commands */
|
||||
}
|
||||
@@ -6651,8 +6651,8 @@ int THD::decide_logging_format(TABLE_LIST *tables)
|
||||
blackhole_table_found= 1;
|
||||
|
||||
if (share->non_determinstic_insert &&
|
||||
(sql_command_flags[lex->sql_command] & CF_CAN_GENERATE_ROW_EVENTS
|
||||
&& !(sql_command_flags[lex->sql_command] & CF_SCHEMA_CHANGE)))
|
||||
(sql_command_flags() & CF_CAN_GENERATE_ROW_EVENTS
|
||||
&& !(sql_command_flags() & CF_SCHEMA_CHANGE)))
|
||||
has_write_tables_with_unsafe_statements= true;
|
||||
|
||||
trans= table->file->has_transactions();
|
||||
@@ -6901,8 +6901,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
|
||||
|
||||
if (blackhole_table_found &&
|
||||
variables.binlog_format == BINLOG_FORMAT_ROW &&
|
||||
(sql_command_flags[lex->sql_command] &
|
||||
(CF_UPDATES_DATA | CF_DELETES_DATA)))
|
||||
(sql_command_flags() & (CF_UPDATES_DATA | CF_DELETES_DATA)))
|
||||
{
|
||||
String table_names;
|
||||
/*
|
||||
@@ -6922,8 +6921,7 @@ int THD::decide_logging_format(TABLE_LIST *tables)
|
||||
}
|
||||
if (!table_names.is_empty())
|
||||
{
|
||||
bool is_update= MY_TEST(sql_command_flags[lex->sql_command] &
|
||||
CF_UPDATES_DATA);
|
||||
bool is_update= MY_TEST(sql_command_flags() & CF_UPDATES_DATA);
|
||||
/*
|
||||
Replace the last ',' with '.' for table_names
|
||||
*/
|
||||
|
Reference in New Issue
Block a user