bzr push into mysql-5.0 branch (kgeorge:2643 to 2644) Bug#30087, Bug#37069

[Georgi Kodinov]

 2644 Georgi Kodinov	2008-07-17
      Folow-up on Bug#37069: fix a valgrind warning
      Don't initalize federated if it's disabled by a command line option.
modified:
  sql/ha_federated.cc

 2643 Marc Alff	2008-07-16
      Bug#30087 Set query_cache_size, if the value is too small, get a unclear warning
      
      Reverting the previous patch
modified:
  mysql-test/r/query_cache.result
  sql/set_var.cc
  sql/share/errmsg.txt
  sql/sql_cache.cc
  sql/sql_cache.h

=== modified file 'sql/ha_federated.cc'
--- a/sql/ha_federated.cc	2008-03-29 07:52:16 +0000
+++ b/sql/ha_federated.cc	2008-07-17 14:33:41 +0000
@@ -405,6 +405,9 @@ static byte *federated_get_key(FEDERATED
 bool federated_db_init()
 {
   DBUG_ENTER("federated_db_init");
+  /* the federated engine can be disabled by a command line option */
+  if (have_federated_db == SHOW_OPTION_DISABLED)
+    DBUG_RETURN(TRUE);
   if (pthread_mutex_init(&federated_mutex, MY_MUTEX_INIT_FAST))
     goto error;
   if (hash_init(&federated_open_tables, &my_charset_bin, 32, 0, 0,