database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-08 00:28:29 +03:00
Code Activity

Merge branch '11.4' into 11.8

Browse Source
This commit is contained in:
Sergei Golubchik
2025-07-28 20:16:25 +02:00
parent 982535b11f c4ed889b74
commit b565b3e7e0
380 changed files with 11138 additions and 2776 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_parse.cc
View File

@@ -54,6 +54,7 @@
#include "sql_test.h" // mysql_print_status
#include "sql_select.h" // handle_select, mysql_select,
// mysql_explain_union
#include "sql_cursor.h" // Select_materialzie
#include "sql_load.h" // mysql_load
#include "sql_servers.h" // create_servers, alter_servers,
// drop_servers, servers_reload
@@ -3067,11 +3068,6 @@ static bool do_execute_sp(THD *thd, sp_head *sp)
ha_rows select_limit= thd->variables.select_limit;
thd->variables.select_limit= HA_POS_ERROR;
/*
Reset current_select as it may point to random data as a
result of previous parsing.
*/
thd->lex->current_select= NULL;
thd->lex->in_sum_func= 0; // For Item_field::fix_fields()
/*
@@ -5992,6 +5988,9 @@ finish:
one of storage engines (e.g. due to deadlock). Rollback transaction in
all storage engines including binary log.
*/
auto &xid_state= thd->transaction->xid_state;
if (xid_state.is_explicit_XA())
xid_state.set_rollback_only();
trans_rollback_implicit(thd);
thd->release_transactional_locks();
}
@@ -6208,7 +6207,7 @@ static bool execute_sqlcom_select(THD *thd, TABLE_LIST *all_tables)
}
}
/* Count number of empty select queries */
if (!thd->get_sent_row_count() && !res)
if (!thd->is_cursor_execution() && !thd->get_sent_row_count() && !res)
status_var_increment(thd->status_var.empty_queries);
else
status_var_add(thd->status_var.rows_sent, thd->get_sent_row_count());