diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 878416b4537..ac78d8e1871 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -1325,19 +1325,6 @@ ERROR HY000: Variable 'skip_show_database' is a read only variable
 SET @@global.skip_show_database= true;
 ERROR HY000: Variable 'skip_show_database' is a read only variable
 #
-SHOW VARIABLES like 'socket';
-Variable_name	Value
-socket	#
-SELECT @@session.socket;
-ERROR HY000: Variable 'socket' is a GLOBAL variable
-SELECT @@global.socket;
-@@global.socket
-#
-SET @@session.socket= 'x';
-ERROR HY000: Variable 'socket' is a read only variable
-SET @@global.socket= 'x';
-ERROR HY000: Variable 'socket' is a read only variable
-#
 SHOW VARIABLES like 'thread_stack';
 Variable_name	Value
 thread_stack	#
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 1ef114b1a16..828cb3a2916 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -1067,18 +1067,6 @@ SET @@global.skip_show_database= true;
 #
 --echo #
 --replace_column 2 #
-SHOW VARIABLES like 'socket';
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SELECT @@session.socket;
---replace_column 1 #
-SELECT @@global.socket;
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@session.socket= 'x';
---error ER_INCORRECT_GLOBAL_LOCAL_VAR
-SET @@global.socket= 'x';
-#
---echo #
---replace_column 2 #
 SHOW VARIABLES like 'thread_stack';
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 SELECT @@session.thread_stack;
diff --git a/sql/slave.cc b/sql/slave.cc
index 6708f2ddd60..43b70f29a68 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -288,7 +288,7 @@ static void print_slave_skip_errors(void)
     10 characters must be sufficient for a number plus {',' | '...'}
     plus a NUL terminator. That is a max 6 digit number.
   */
-  const int MIN_ROOM= 10;
+  const size_t MIN_ROOM= 10;
   DBUG_ENTER("print_slave_skip_errors");
   DBUG_ASSERT(sizeof(slave_skip_error_names) > MIN_ROOM);
   DBUG_ASSERT(MAX_SLAVE_ERROR <= 999999); // 6 digits