Commit 9b07cafe authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-5.0-7800 

into mysql.com:/home/jimw/my/mysql-5.0-clean


sql/set_var.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
parents 9c71571f e9beb6d0

mysql-test/r/rpl_variables.result

+9 −0
Original line number Diff line number Diff line
@@ -6,3 +6,12 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; 
start slave;

set global slave_net_timeout=100;

set global sql_slave_skip_counter=100;

show variables like 'slave_compressed_protocol';

Variable_name	Value

slave_compressed_protocol	OFF

show variables like 'slave_load_tmpdir';

Variable_name	Value

slave_load_tmpdir	MYSQL_TEST_DIR/var/tmp/

show variables like 'slave_skip_errors';

Variable_name	Value

slave_skip_errors	3,100,137,643,1752

mysql-test/t/rpl_variables-master.opt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
--slave-skip-errors=3,100,137,643,1752

mysql-test/t/rpl_variables.test

+8 −0
Original line number Diff line number Diff line
@@ -2,3 +2,11 @@ source include/master-slave.inc; 


set global slave_net_timeout=100;

set global sql_slave_skip_counter=100;



# BUG #7800: Add various-slave related variables to SHOW VARIABLES

show variables like 'slave_compressed_protocol';

--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR

show variables like 'slave_load_tmpdir';

# We just set some arbitrary values in variables-master.opt so we can test

# that a list of values works correctly

show variables like 'slave_skip_errors';

sql/set_var.cc

+4 −0
Original line number Diff line number Diff line
@@ -945,7 +945,11 @@ struct show_var_st init_vars[]= { 
  {"skip_networking",         (char*) &opt_disable_networking,      SHOW_BOOL},

  {"skip_show_database",      (char*) &opt_skip_show_db,            SHOW_BOOL},

#ifdef HAVE_REPLICATION

  {sys_slave_compressed_protocol.name,

    (char*) &sys_slave_compressed_protocol,           SHOW_SYS},

  {"slave_load_tmpdir",       (char*) &slave_load_tmpdir,           SHOW_CHAR_PTR},

  {sys_slave_net_timeout.name,(char*) &sys_slave_net_timeout,	    SHOW_SYS},

  {"slave_skip_errors",       (char*) &slave_error_mask,            SHOW_SLAVE_SKIP_ERRORS},

  {sys_slave_trans_retries.name,(char*) &sys_slave_trans_retries,   SHOW_SYS},

#endif

  {sys_slow_launch_time.name, (char*) &sys_slow_launch_time,        SHOW_SYS},

sql/sql_show.cc

+26 −0
Original line number Diff line number Diff line
@@ -1345,6 +1345,32 @@ 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= int10_to_str(i, (char*) end, 10);

                *(char*) end++= ',';

              }

            }

            if (end != buff)

              end--;				// Remove last ','

          }

          break;

        }

#endif /* HAVE_REPLICATION */

        case SHOW_OPENTABLES:

          end= int10_to_str((long) cached_tables(), buff, 10);