bk commit into 5.1 tree (cmiller:1.2347) BUG#14262

[Chad MILLER]

Below is the list of changes that have just been committed into a local
5.1 repository of cmiller. When cmiller 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@stripped, 2006-10-12 17:51:56-04:00, cmiller@stripped +3 -0
  Additional patch for 5.1 commit for Bug#14262.

  sql/sp.cc@stripped, 2006-10-12 17:51:52-04:00, cmiller@stripped +4 -4
    Update binlog-writing scheme to 5.1 model.

  sql/sql_acl.cc@stripped, 2006-10-12 17:51:52-04:00, cmiller@stripped +14 -14
    Update binlog-writing scheme to 5.1 model.

  sql/sql_trigger.cc@stripped, 2006-10-12 17:51:52-04:00, cmiller@stripped +2 -3
    Update binlog-writing scheme to 5.1 model.

# 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:	cmiller
# Host:	zippy.cornsilk.net
# Root:	/home/cmiller/work/mysql/bug14262/my51-alter

--- 1.219/sql/sql_acl.cc	2006-10-12 17:52:03 -04:00
+++ 1.220/sql/sql_acl.cc	2006-10-12 17:52:03 -04:00
@@ -3146,8 +3146,8 @@ bool mysql_table_grant(THD *thd, TABLE_L
     if (mysql_bin_log.is_open())
     {
       thd->clear_error();
-      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-      mysql_bin_log.write(&qinfo);
+      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                        thd->query, thd->query_length, FALSE, FALSE);
     }
   }
 
@@ -3312,8 +3312,8 @@ bool mysql_routine_grant(THD *thd, TABLE
     if (mysql_bin_log.is_open())
     {
       thd->clear_error();
-      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-      mysql_bin_log.write(&qinfo);
+      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                        thd->query, thd->query_length, FALSE, FALSE);
     }
   }
 
@@ -3425,8 +3425,8 @@ bool mysql_grant(THD *thd, const char *d
     if (mysql_bin_log.is_open())
     {
       thd->clear_error();
-      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-      mysql_bin_log.write(&qinfo);
+      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                        thd->query, thd->query_length, FALSE, FALSE);
     }
   }
 
@@ -5438,8 +5438,8 @@ bool mysql_create_user(THD *thd, List <L
 
   if (mysql_bin_log.is_open())
   {
-    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-    mysql_bin_log.write(&qinfo);
+    thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                      thd->query, thd->query_length, FALSE, FALSE);
   }
 
   rw_unlock(&LOCK_grant);
@@ -5501,8 +5501,8 @@ bool mysql_drop_user(THD *thd, List <LEX
 
   if (mysql_bin_log.is_open())
   {
-    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-    mysql_bin_log.write(&qinfo);
+    thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                      thd->query, thd->query_length, FALSE, FALSE);
   }
 
   rw_unlock(&LOCK_grant);
@@ -5577,8 +5577,8 @@ bool mysql_rename_user(THD *thd, List <L
 
   if (mysql_bin_log.is_open())
   {
-    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-    mysql_bin_log.write(&qinfo);
+    thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                      thd->query, thd->query_length, FALSE, FALSE);
   }
 
   rw_unlock(&LOCK_grant);
@@ -5758,8 +5758,8 @@ bool mysql_revoke_all(THD *thd,  List <L
 
   if (mysql_bin_log.is_open())
   {
-    Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-    mysql_bin_log.write(&qinfo);
+    thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                      thd->query, thd->query_length, FALSE, FALSE);
   }
 
   rw_unlock(&LOCK_grant);

--- 1.70/sql/sql_trigger.cc	2006-10-12 17:52:03 -04:00
+++ 1.71/sql/sql_trigger.cc	2006-10-12 17:52:03 -04:00
@@ -284,9 +284,8 @@ end:
       thd->clear_error();
 
       /* Such a statement can always go directly to binlog, no trans cache. */
-      Query_log_event qinfo(thd, stmt_query.ptr(), stmt_query.length(), 0,
-                            FALSE);
-      mysql_bin_log.write(&qinfo);
+      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                        stmt_query.ptr(), stmt_query.length(), FALSE, FALSE);
     }
   }
 

--- 1.127/sql/sp.cc	2006-10-12 17:52:03 -04:00
+++ 1.128/sql/sp.cc	2006-10-12 17:52:03 -04:00
@@ -659,8 +659,8 @@ db_drop_routine(THD *thd, int type, sp_n
     if (mysql_bin_log.is_open())
     {
       thd->clear_error();
-      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-      mysql_bin_log.write(&qinfo);
+      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                        thd->query, thd->query_length, FALSE, FALSE);
     }
   }
 
@@ -704,8 +704,8 @@ db_update_routine(THD *thd, int type, sp
     if (mysql_bin_log.is_open())
     {
       thd->clear_error();
-      Query_log_event qinfo(thd, thd->query, thd->query_length, 0, FALSE);
-      mysql_bin_log.write(&qinfo);
+      thd->binlog_query(THD::MYSQL_QUERY_TYPE,
+                        thd->query, thd->query_length, FALSE, FALSE);
     }
   }