MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Ingo Struewing Date:November 29 2008 1:58pm
Subject:bzr push into mysql-6.0-bugteam branch (ingo.struewing:2762 to 2763)
View as plain text  
 2763 Ingo Struewing	2008-11-29 [merge]
      auto-merge

 2762 Ingo Struewing	2008-11-29 [merge]
      auto-merge
added:
  mysql-test/r/ctype_filesystem.result
  mysql-test/t/ctype_filesystem-master.opt
  mysql-test/t/ctype_filesystem.test
modified:
  mysql-test/r/update.result
  mysql-test/r/view.result
  mysql-test/t/update.test
  mysql-test/t/view.test
  sql/mysqld.cc
  sql/set_var.cc
  sql/set_var.h
  sql/sql_show.cc
  sql/sql_update.cc
  sql/sql_view.cc

=== modified file 'mysql-test/r/variables.result'
--- a/mysql-test/r/variables.result	2008-11-24 20:46:11 +0000
+++ b/mysql-test/r/variables.result	2008-11-27 11:01:59 +0000
@@ -1325,19 +1325,6 @@ ERROR HY000: Variable 'skip_show_databas
 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	#

=== modified file 'mysql-test/t/variables.test'
--- a/mysql-test/t/variables.test	2008-11-24 20:46:11 +0000
+++ b/mysql-test/t/variables.test	2008-11-27 11:01:59 +0000
@@ -1071,18 +1071,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;

=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2008-11-28 11:40:40 +0000
+++ b/sql/slave.cc	2008-11-28 16:05:44 +0000
@@ -290,7 +290,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 uint 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

Thread
bzr push into mysql-6.0-bugteam branch (ingo.struewing:2762 to 2763) Ingo Struewing29 Nov