database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Galera MTR Tests: fix variable output in galera_as_slave_gtid_replicate_do_db.result

Browse Source 
Signed-off-by: Sachin Setiya <sachinsetia1001@gmail.com>
This commit is contained in:
Sachin Setiya
2017-03-14 14:42:52 +05:30
parent f29c40d0a5
commit 00f1ed6655
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.h
View File

@@ -69,6 +69,7 @@ struct wsrep_thd_shadow {
char *db; char *db;
size_t db_length; size_t db_length;
my_hrtime_t user_time; my_hrtime_t user_time;
longlong row_count_func;
}; };
#endif #endif
class Reprepare_observer; class Reprepare_observer;

33
sql/wsrep_thd.cc
View File

@@ -164,6 +164,7 @@ static void wsrep_prepare_bf_thd(THD *thd, struct wsrep_thd_shadow* shadow)
shadow->db = thd->db; shadow->db = thd->db;
shadow->db_length = thd->db_length; shadow->db_length = thd->db_length;
shadow->user_time = thd->user_time; shadow->user_time = thd->user_time;
shadow->row_count_func= thd->get_row_count_func();
thd->reset_db(NULL, 0); thd->reset_db(NULL, 0);
} }
@@ -184,6 +185,7 @@ static void wsrep_return_from_bf_mode(THD *thd, struct wsrep_thd_shadow* shadow)
thd->wsrep_rgi->cleanup_after_session(); thd->wsrep_rgi->cleanup_after_session();
delete thd->wsrep_rgi; delete thd->wsrep_rgi;
thd->wsrep_rgi = NULL; thd->wsrep_rgi = NULL;
thd->set_row_count_func(shadow->row_count_func);
} }
void wsrep_replay_transaction(THD *thd) void wsrep_replay_transaction(THD *thd)
@@ -198,12 +200,31 @@ void wsrep_replay_transaction(THD *thd)
WSREP_ERROR("replay issue, thd has reported status already"); WSREP_ERROR("replay issue, thd has reported status already");
} }
/* /*
PS reprepare observer should have been removed already. PS reprepare observer should have been removed already.
open_table() will fail if we have dangling observer here. open_table() will fail if we have dangling observer here.
*/ */
DBUG_ASSERT(thd->m_reprepare_observer == NULL); DBUG_ASSERT(thd->m_reprepare_observer == NULL);
struct da_shadow
{
enum Diagnostics_area::enum_diagnostics_status status;
ulonglong affected_rows;
ulonglong last_insert_id;
char message[MYSQL_ERRMSG_SIZE];
};
struct da_shadow da_status;
da_status.status= thd->get_stmt_da()->status();
if (da_status.status == Diagnostics_area::DA_OK)
{
da_status.affected_rows= thd->get_stmt_da()->affected_rows();
da_status.last_insert_id= thd->get_stmt_da()->last_insert_id();
strmake(da_status.message,
thd->get_stmt_da()->message(),
sizeof(da_status.message)-1);
}
thd->get_stmt_da()->reset_diagnostics_area(); thd->get_stmt_da()->reset_diagnostics_area();
thd->wsrep_conflict_state= REPLAYING; thd->wsrep_conflict_state= REPLAYING;
@@ -270,7 +291,17 @@ void wsrep_replay_transaction(THD *thd)
} }
else else
{ {
my_ok(thd); if (da_status.status == Diagnostics_area::DA_OK)
{
my_ok(thd,
da_status.affected_rows,
da_status.last_insert_id,
da_status.message);
}
else
{
my_ok(thd);
}
} }
break; break;
case WSREP_TRX_FAIL: case WSREP_TRX_FAIL: