merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge

Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/extra/rpl_tests/rpl_loaddata.test
Text conflict in mysql-test/r/mysqlbinlog2.result
Text conflict in mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
Text conflict in mysql-test/suite/binlog/r/binlog_unsafe.result
Text conflict in mysql-test/suite/rpl/r/rpl_insert_id.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_auto_increment_bug33029.result
Text conflict in mysql-test/suite/rpl/r/rpl_udf.result
Text conflict in mysql-test/suite/rpl/t/rpl_slow_query_log.test
Text conflict in sql/field.h
Text conflict in sql/log.cc
Text conflict in sql/log_event.cc
Text conflict in sql/log_event_old.cc
Text conflict in sql/mysql_priv.h
Text conflict in sql/share/errmsg.txt
Text conflict in sql/sp.cc
Text conflict in sql/sql_acl.cc
Text conflict in sql/sql_base.cc
Text conflict in sql/sql_class.h
Text conflict in sql/sql_db.cc
Text conflict in sql/sql_delete.cc
Text conflict in sql/sql_insert.cc
Text conflict in sql/sql_lex.cc
Text conflict in sql/sql_lex.h
Text conflict in sql/sql_load.cc
Text conflict in sql/sql_table.cc
Text conflict in sql/sql_update.cc
Text conflict in sql/sql_view.cc
Conflict adding files to storage/innobase.  Created directory.
Conflict because storage/innobase is not versioned, but has versioned children.  Versioned directory.
Conflict adding file storage/innobase.  Moved existing file to storage/innobase.moved.
Conflict adding files to storage/innobase/handler.  Created directory.
Conflict because storage/innobase/handler is not versioned, but has versioned children.  Versioned directory.
Contents conflict in storage/innobase/handler/ha_innodb.cc

1 files changed, 9 insertions, 10 deletions

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index aa124a0a004..9fef7114898 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -181,7 +181,7 @@ uchar* dboptions_get_key(my_dbopt_t *opt, size_t *length,
 static inline int write_to_binlog(THD *thd, char *query, uint q_len,
                                   char *db, uint db_len)
 {
-  Query_log_event qinfo(thd, query, q_len, 0, 0, 0);
+  Query_log_event qinfo(thd, query, q_len, FALSE, TRUE, FALSE, 0);
   qinfo.db= db;
   qinfo.db_len= db_len;
   return mysql_bin_log.write(&qinfo);
@@ -750,7 +750,7 @@ not_silent:
     if (mysql_bin_log.is_open())
     {
       int errcode= query_error_code(thd, TRUE);
-      Query_log_event qinfo(thd, query, query_length, 0, 
+      Query_log_event qinfo(thd, query, query_length, FALSE, TRUE,
 			    /* suppress_use */ TRUE, errcode);
 
       /*
@@ -842,10 +842,9 @@ bool mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
 
   if (mysql_bin_log.is_open())
   {
-    thd->clear_error();
-    Query_log_event qinfo(thd, thd->query(), thd->query_length(), 0,
-			  /* suppress_use */ TRUE, 0);
-
+    int errcode= query_error_code(thd, TRUE); 
+    Query_log_event qinfo(thd, thd->query(), thd->query_length(), FALSE, TRUE,
+			  /* suppress_use */ TRUE, errcode);
     /*
       Write should use the database being created as the "current
       database" and not the threads current database, which is the
@@ -994,9 +993,9 @@ bool mysql_rm_db(THD *thd,char *db,bool if_exists, bool silent)
     }
     if (mysql_bin_log.is_open())
     {
-      thd->clear_error();
-      Query_log_event qinfo(thd, query, query_length, 0, 
-			    /* suppress_use */ TRUE, 0);
+      int errcode= query_error_code(thd, TRUE);
+      Query_log_event qinfo(thd, query, query_length, FALSE, TRUE,
+			    /* suppress_use */ TRUE, errcode);
       /*
         Write should use the database being created as the "current
         database" and not the threads current database, which is the
@@ -2008,7 +2007,7 @@ bool mysql_upgrade_db(THD *thd, LEX_STRING *old_db)
   {
     int errcode= query_error_code(thd, TRUE);
     Query_log_event qinfo(thd, thd->query(), thd->query_length(),
-                          0, TRUE, errcode);
+                          FALSE, TRUE, TRUE, errcode);
     thd->clear_error();
     error|= mysql_bin_log.write(&qinfo);
   }