summaryrefslogtreecommitdiff
path: root/sql/sql_show.cc
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-05-07 06:55:47 -0700
committerunknown <jimw@mysql.com>2005-05-07 06:55:47 -0700
commit686d0ba155c01b5ef792da6debd0e5471bff7366 (patch)
tree096fdf1c8f3d3d801e9684dd8a66b8721d73990c /sql/sql_show.cc
parentbd58e3e59cfa4dd03feb515b38858ba05820284c (diff)
downloadmariadb-git-686d0ba155c01b5ef792da6debd0e5471bff7366.tar.gz
Add support for slave_compressed_protocol, slave_load_tmpdir, and
slave_skip_errors in SHOW VARIABLES. (Bug #7800) sql/structs.h: Add SHOW_SLAVE_SKIP_ERRORS sql/set_var.cc: Add slave_compressed_protocol, slave_load_tmpdir, slave_skip_errors to list of variables. mysql-test/t/rpl_variables.test: Add test for additional slave-related variables mysql-test/r/rpl_variables.result: Update results sql/sql_show.cc: Handle showing slave_skip_errors
Diffstat (limited to 'sql/sql_show.cc')
-rw-r--r--sql/sql_show.cc27
1 files changed, 27 insertions, 0 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index ceb98740298..93445bedf98 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -1345,6 +1345,33 @@ static bool show_status_array(THD *thd, const char *wild,
pthread_mutex_unlock(&LOCK_active_mi);
break;
}
+ case SHOW_SLAVE_SKIP_ERRORS:
+ {
+ MY_BITMAP *bitmap= (MY_BITMAP *)value;
+ if (!use_slave_mask || bitmap_is_clear_all(bitmap))
+ {
+ end= strmov(buff, "OFF");
+ }
+ else if (bitmap_is_set_all(bitmap))
+ {
+ end= strmov(buff, "ALL");
+ }
+ else
+ {
+ for (int i= 1; i < MAX_SLAVE_ERROR; i++)
+ {
+ if (bitmap_is_set(bitmap, i))
+ {
+ end+= my_snprintf((char *)end, sizeof(buff) - (end - buff),
+ "%d,", i);
+ }
+ }
+ if (end != buff)
+ end--; // Remove last ','
+ *(char *)end= 0;
+ }
+ break;
+ }
#endif /* HAVE_REPLICATION */
case SHOW_OPENTABLES:
end= int10_to_str((long) cached_tables(), buff, 10);