bk commit into 5.0 tree (gluh:1.1932) BUG#11775

[gluh]

Below is the list of changes that have just been committed into a local
5.0 repository of gluh. When gluh does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1932 05/09/02 13:21:32 gluh@stripped +4 -0
  Fix for bug#11775 Variable character_set_system does not exist (sometimes).
    Variable character_set_system is selectable now
    More accurate error message results during 
    update of character_set_system and some other read only variables

  sql/set_var.h
    1.70 05/09/02 13:20:19 gluh@stripped +2 -1
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      Variable character_set_system is selectable now
      More accurate error message results during 
      update of character_set_system and some other read only variables

  sql/set_var.cc
    1.137 05/09/02 13:20:19 gluh@stripped +3 -26
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      Variable character_set_system is selectable now
      More accurate error message results during 
      update of character_set_system and some other read only variables

  mysql-test/t/variables.test
    1.48 05/09/02 13:20:19 gluh@stripped +9 -0
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      test case

  mysql-test/r/variables.result
    1.72 05/09/02 13:20:19 gluh@stripped +7 -0
    Fix for bug#11775 Variable character_set_system does not exist (sometimes).
      test case

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Bugs/5.0.11775

--- 1.71/mysql-test/r/variables.result	Wed Aug 31 10:24:55 2005
+++ 1.72/mysql-test/r/variables.result	Fri Sep  2 13:20:19 2005
@@ -540,3 +540,10 @@
 select @@have_innodb;
 @@have_innodb
 #
+select @@character_set_system;
+@@character_set_system
+utf8
+set global character_set_system = latin1;
+ERROR HY000: Variable 'character_set_system' is a read only variable
+set @@global.version_compile_os='234';
+ERROR HY000: Variable 'version_compile_os' is a read only variable

--- 1.47/mysql-test/t/variables.test	Wed Aug 31 10:24:55 2005
+++ 1.48/mysql-test/t/variables.test	Fri Sep  2 13:20:19 2005
@@ -427,3 +427,12 @@
 
 --replace_column 1 #
 select @@have_innodb;
+
+#
+# Bug #11775 Variable character_set_system does not exist (sometimes)
+#
+select @@character_set_system;
+--error 1238
+set global character_set_system = latin1;
+--error 1238
+set @@global.version_compile_os='234';

--- 1.136/sql/set_var.cc	Wed Aug 31 10:23:04 2005
+++ 1.137/sql/set_var.cc	Fri Sep  2 13:20:19 2005
@@ -142,11 +142,8 @@
 sys_var_thd_ulong	sys_bulk_insert_buff_size("bulk_insert_buffer_size",
 						  &SV::bulk_insert_buff_size);
 sys_var_character_set_server	sys_character_set_server("character_set_server");
-sys_var_str			sys_charset_system("character_set_system",
-				    sys_check_charset,
-				    sys_update_charset,
-				    sys_set_default_charset,
-                                    (char *)my_charset_utf8_general_ci.name);
+sys_var_const_str       sys_charset_system("character_set_system",
+                                           (char *)my_charset_utf8_general_ci.name);
 sys_var_character_set_database	sys_character_set_database("character_set_database");
 sys_var_character_set_client  sys_character_set_client("character_set_client");
 sys_var_character_set_connection 
sys_character_set_connection("character_set_connection");
@@ -569,6 +566,7 @@
   &sys_character_set_client,
   &sys_character_set_connection,
   &sys_character_set_results,
+  &sys_charset_system,
   &sys_collation_connection,
   &sys_collation_database,
   &sys_collation_server,
@@ -1115,27 +1113,6 @@
 {
   strmake(ft_boolean_syntax, def_ft_boolean_syntax,
 	  sizeof(ft_boolean_syntax)-1);
-}
-
-/*
-  The following 3 functions need to be changed in 4.1 when we allow
-  one to change character sets
-*/
-
-static int sys_check_charset(THD *thd, set_var *var)
-{
-  return 0;
-}
-
-
-static bool sys_update_charset(THD *thd, set_var *var)
-{
-  return 0;
-}
-
-
-static void sys_set_default_charset(THD *thd, enum_var_type type)
-{
 }
 
 

--- 1.69/sql/set_var.h	Fri Jul 29 00:39:07 2005
+++ 1.70/sql/set_var.h	Fri Sep  2 13:20:19 2005
@@ -190,6 +190,7 @@
     return 1;
   }
   bool check_default(enum_var_type type) { return 1; }
+  bool is_readonly() const { return 1; }
 };
 
 
@@ -900,7 +901,7 @@
 bool not_all_support_one_shot(List<set_var_base> *var_list);
 void fix_delay_key_write(THD *thd, enum_var_type type);
 ulong fix_sql_mode(ulong sql_mode);
-extern sys_var_str sys_charset_system;
+extern sys_var_const_str sys_charset_system;
 extern sys_var_str sys_init_connect;
 extern sys_var_str sys_init_slave;
 extern sys_var_thd_time_zone sys_time_zone;