summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-03-18 19:45:25 +0100
committerSergei Golubchik <serg@mariadb.org>2020-03-23 13:02:35 +0100
commit64dd39694810c093c64c23c0f4e8de02afa921f7 (patch)
tree8e3c07a6a8eaa6a68710ce9e16736c7e4ad047a0
parent328edf8560dbf1941ce314fa112e0db05d9f97f1 (diff)
downloadmariadb-git-64dd39694810c093c64c23c0f4e8de02afa921f7.tar.gz
remove redundant info on rpl test failure
these three SHOW statements (and more) are issued from include/analyze-sync_with_master.test too. no need to do it twice.
-rw-r--r--client/mysqltest.cc68
1 files changed, 0 insertions, 68 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 1f17f75e1b8..00918298ff3 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1103,71 +1103,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
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)
{
/* 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");
if (!result_str)