bk commit into 5.0 tree (ingo:1.1956) BUG#10473

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of mydev. When mydev 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.1956 05/08/07 20:39:17 ingo@stripped +4 -0
  Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
  Give the user a warning if he tries to destroy the default key cache.

  sql/share/errmsg.txt
    1.38 05/08/07 20:39:11 ingo@stripped +3 -0
    Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
    The new message string.

  sql/set_var.cc
    1.131 05/08/07 20:39:11 ingo@stripped +5 -0
    Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
    Give the user a warning if he tries to destroy the default key cache.

  mysql-test/t/key_cache.test
    1.17 05/08/07 20:39:11 ingo@stripped +7 -0
    Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
    The test case.

  mysql-test/r/key_cache.result
    1.16 05/08/07 20:39:10 ingo@stripped +6 -0
    Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
    The test result.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-5000

--- 1.37/sql/share/errmsg.txt	2005-08-03 01:28:30 +02:00
+++ 1.38/sql/share/errmsg.txt	2005-08-07 20:39:11 +02:00
@@ -5388,3 +5388,6 @@
 	eng "Thread stack overrun:  %ld bytes used of a %ld byte stack, and %ld bytes needed.  Use 'mysqld -O thread_stack=#' to specify a bigger stack."
 ER_TOO_LONG_BODY 42000 S1009
 	eng "Routine body for '%-.100s' is too long"
+ER_WARN_CANT_DROP_DEFAULT_KEYCACHE
+	eng "Cannot drop default keycache"

--- 1.15/mysql-test/r/key_cache.result	2005-08-02 02:50:32 +02:00
+++ 1.16/mysql-test/r/key_cache.result	2005-08-07 20:39:10 +02:00
@@ -289,3 +289,9 @@
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
+set @@global.key_buffer_size=0;
+Warnings:
+Warning	1438	Cannot drop default keycache
+select @@global.key_buffer_size;
+@@global.key_buffer_size
+2097152

--- 1.16/mysql-test/t/key_cache.test	2005-07-28 02:21:43 +02:00
+++ 1.17/mysql-test/t/key_cache.test	2005-08-07 20:39:11 +02:00
@@ -168,4 +168,11 @@
 
 drop table t1;
 
+#
+# Bug#10473 - Can't set 'key_buffer_size' system variable to ZERO
+# (One cannot drop the default key cache.)
+#
+set @@global.key_buffer_size=0;
+select @@global.key_buffer_size;
+
 # End of 4.1 tests

--- 1.130/sql/set_var.cc	2005-07-31 21:56:16 +02:00
+++ 1.131/sql/set_var.cc	2005-08-07 20:39:11 +02:00
@@ -2293,7 +2293,12 @@
   if (!tmp)					// Zero size means delete
   {
     if (key_cache == dflt_key_cache)
+    {
+      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+                          ER_WARN_CANT_DROP_DEFAULT_KEYCACHE,
+                          ER(ER_WARN_CANT_DROP_DEFAULT_KEYCACHE));
       goto end;					// Ignore default key cache
+    }
 
     if (key_cache->key_cache_inited)		// If initied
     {