bk commit into 5.1 tree (rburnett:1.2200)

[reggie]

Below is the list of changes that have just been committed into a local
5.1 repository of rburnett. When rburnett 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.2200 06/06/20 19:43:31 rburnett@stripped +2 -0
  set_var.cc, log.cc:
    some casts to MYSQL_QUERY_LOG to satisfy the compiler

  sql/set_var.cc
    1.182 06/06/20 19:42:57 rburnett@stripped +3 -3
    some casts to MYSQL_QUERY_LOG to satisfy the compiler

  sql/log.cc
    1.217 06/06/20 19:42:57 rburnett@stripped +6 -4
    some casts to MYSQL_QUERY_LOG to satisfy the compiler

# 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:	rburnett
# Host:	production.mysql.com
# Root:	/usersnfs/rburnett/mysql-5.1-kt2

--- 1.216/sql/log.cc	2006-06-19 17:50:01 +02:00
+++ 1.217/sql/log.cc	2006-06-20 19:42:57 +02:00
@@ -935,8 +935,9 @@
     {
       if ((res= reopen_log_table(log_type)))
         goto err;
-      file_log_handler->get_mysql_slow_log()->
-        open_query_log(sys_var_slow_log_path.value);
+      MYSQL_QUERY_LOG *log= (MYSQL_QUERY_LOG*)
+        file_log_handler->get_mysql_slow_log();
+      log->open_query_log(sys_var_slow_log_path.value);
       init_slow_log(log_output_options);
       opt_slow_log= TRUE;
     }
@@ -946,8 +947,9 @@
     {
       if ((res= reopen_log_table(log_type)))
         goto err;
-      file_log_handler->get_mysql_log()->
-        open_query_log(sys_var_general_log_path.value);
+      MYSQL_QUERY_LOG *log= (MYSQL_QUERY_LOG*)
+        file_log_handler->get_mysql_log();
+      log->open_query_log(sys_var_general_log_path.value);
       init_general_log(log_output_options);
       opt_log= TRUE;
     }

--- 1.181/sql/set_var.cc	2006-06-19 15:32:57 +02:00
+++ 1.182/sql/set_var.cc	2006-06-20 19:42:57 +02:00
@@ -2602,7 +2602,7 @@
 			     set_var *var, const char *log_ext,
 			     bool log_state, uint log_type)
 {
-  MYSQL_LOG *file_log;
+  MYSQL_QUERY_LOG *file_log;
   char buff[FN_REFLEN];
   char *res= 0, *old_value=(char *)(var ? var->value->str_value.ptr() : 0);
   bool result= 0;
@@ -2610,10 +2610,10 @@
 
   switch (log_type) {
   case QUERY_LOG_SLOW:
-    file_log= logger.get_slow_log_file_handler();
+    file_log= (MYSQL_QUERY_LOG*)logger.get_slow_log_file_handler();
     break;
   case QUERY_LOG_GENERAL:
-    file_log= logger.get_log_file_handler();
+    file_log= (MYSQL_QUERY_LOG*)logger.get_log_file_handler();
     break;
   default:
     DBUG_ASSERT(0);