bk commit into 5.1 tree (knielsen:1.2081)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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.2081 06/01/19 21:50:57 knielsen@stripped +2 -0
  Merge mysql.com:/usr/local/mysql/ab/mirrors/pullers/mysql-5.1-new
  into  mysql.com:/usr/local/mysql/tmp5.1

  sql/sql_class.cc
    1.238 06/01/19 21:50:51 knielsen@stripped +0 -0
    Auto merged

  sql/log_event.cc
    1.200 06/01/19 21:50:51 knielsen@stripped +0 -0
    Auto merged

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/tmp5.1/RESYNC

--- 1.199/sql/log_event.cc	2006-01-17 15:51:58 +01:00
+++ 1.200/sql/log_event.cc	2006-01-19 21:50:51 +01:00
@@ -1795,7 +1795,7 @@
 
     /* If the query was not ignored, it is printed to the general log */
     if (thd->net.last_errno != ER_SLAVE_IGNORED_TABLE)
-      mysql_log.write(thd,COM_QUERY,"%s",thd->query);
+      general_log_print(thd, COM_QUERY, "%s", thd->query);
 
 compare_errors:
 
@@ -3513,7 +3513,8 @@
 int Xid_log_event::exec_event(struct st_relay_log_info* rli)
 {
   /* For a slave Xid_log_event is COMMIT */
-  mysql_log.write(thd,COM_QUERY,"COMMIT /* implicit, from Xid_log_event */");
+  general_log_print(thd, COM_QUERY,
+                    "COMMIT /* implicit, from Xid_log_event */");
   return end_trans(thd, COMMIT) || Log_event::exec_event(rli);
 }
 #endif /* !MYSQL_CLIENT */

--- 1.237/sql/sql_class.cc	2006-01-17 15:53:55 +01:00
+++ 1.238/sql/sql_class.cc	2006-01-19 21:50:51 +01:00
@@ -658,6 +658,9 @@
   charset_is_collation_connection= 
     !String::needs_conversion(0,charset(),variables.collation_connection,
                               &not_used);
+  charset_is_character_set_filesystem= 
+    !String::needs_conversion(0, charset(),
+                              variables.character_set_filesystem, &not_used);
 }