mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant info on rpl test failure

Browse source 
these three SHOW statements (and more) are issued from
include/analyze-sync_with_master.test too.
no need to do it twice.
This commit is contained in:
Sergei Golubchik 2020-03-18 19:45:25 +01:00
parent 328edf8560
commit 64dd396948
1 changed files with 0 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
client/mysqltest.cc
View file

@ -1102,71 +1102,6 @@ void do_eval(DYNAMIC_STRING *query_eval, const char *query,
} }
/*
Run query and dump the result to stderr in vertical format
NOTE! This function should be safe to call when an error
has occurred and thus any further errors will be ignored (although logged)
SYNOPSIS
show_query
mysql - connection to use
query - query to run
*/
static void show_query(MYSQL* mysql, const char* query)
{
MYSQL_RES* res;
DBUG_ENTER("show_query");
if (!mysql)
DBUG_VOID_RETURN;
if (mysql_query(mysql, query))
{
log_msg("Error running query '%s': %d %s",
query, mysql_errno(mysql), mysql_error(mysql));
DBUG_VOID_RETURN;
}
if ((res= mysql_store_result(mysql)) == NULL)
{
/* No result set returned */
DBUG_VOID_RETURN;
}
{
MYSQL_ROW row;
unsigned int i;
unsigned int row_num= 0;
unsigned int num_fields= mysql_num_fields(res);
MYSQL_FIELD *fields= mysql_fetch_fields(res);
fprintf(stderr, "=== %s ===\n", query);
while ((row= mysql_fetch_row(res)))
{
unsigned long *lengths= mysql_fetch_lengths(res);
row_num++;
fprintf(stderr, "---- %d. ----\n", row_num);
for(i= 0; i < num_fields; i++)
{
fprintf(stderr, "%s\t%.*s\n",
fields[i].name,
(int)lengths[i], row[i] ? row[i] : "NULL");
}
}
for (i= 0; i < strlen(query)+8; i++)
fprintf(stderr, "=");
fprintf(stderr, "\n\n");
}
mysql_free_result(res);
DBUG_VOID_RETURN;
}
/* /*
Show any warnings just before the error. Since the last error Show any warnings just before the error. Since the last error
is added to the warning stack, only print @@warning_count-1 warnings. is added to the warning stack, only print @@warning_count-1 warnings.
@ -4829,9 +4764,6 @@ void do_sync_with_master2(struct st_command *command, long offset,
if (!result_str || result < 0) if (!result_str || result < 0)
{ {
/* master_pos_wait returned NULL or < 0 */ /* master_pos_wait returned NULL or < 0 */
show_query(mysql, "SHOW MASTER STATUS");
show_query(mysql, "SHOW SLAVE STATUS");
show_query(mysql, "SHOW PROCESSLIST");
fprintf(stderr, "analyze: sync_with_master\n"); fprintf(stderr, "analyze: sync_with_master\n");
if (!result_str) if (!result_str)