From: Staale Smedseng
Date: July 1 2009 12:35pm
Subject: bzr push into mysql-5.1-bugteam branch (staale.smedseng:2989 to 2990)
List-Archive: http://lists.mysql.com/commits/77650
Message-Id: <20090701123545.B71C8D6A18A@atum21.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3965414764520615268=="

--===============3965414764520615268==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 2990 Staale Smedseng	2009-07-01 [merge]
      Merge from 5.0

    modified:
      sql/sql_parse.cc
 2989 Satya B	2009-07-01 [merge]
      merge to 5.1-bugteam

    added:
      mysql-test/suite/binlog/r/binlog_row_mysqlbinlog_db_filter.result
      mysql-test/suite/binlog/t/binlog_row_mysqlbinlog_db_filter.test
    modified:
      client/mysqlbinlog.cc
      sql/log_event.h
      storage/innobase/Makefile.am
=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2009-06-29 14:00:47 +0000
+++ b/sql/sql_parse.cc	2009-07-01 12:32:04 +0000
@@ -1350,7 +1350,7 @@ bool dispatch_command(enum enum_server_c
       if (check_access(thd, CREATE_ACL, db.str , 0, 1, 0,
                        is_schema_db(db.str)))
 	break;
-      general_log_print(thd, command, packet);
+      general_log_print(thd, command, "%.*s", db.length, db.str);
       bzero(&create_info, sizeof(create_info));
       mysql_create_db(thd, (lower_case_table_names == 2 ? alias.str : db.str),
                       &create_info, 0);
@@ -1375,7 +1375,7 @@ bool dispatch_command(enum enum_server_c
                    ER(ER_LOCK_OR_ACTIVE_TRANSACTION), MYF(0));
 	break;
       }
-      general_log_write(thd, command, db.str, db.length);
+      general_log_write(thd, command, "%.*s", db.length, db.str);
       mysql_rm_db(thd, db.str, 0, 0);
       break;
     }


--===============3965414764520615268==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/staale.smedseng@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: staale.smedseng@stripped
# target_branch: file:///export/home/tmp/ss156133/z/45790-51/
# testament_sha1: 41294cc7ae6fe0688f78d607fb62f85f7bbd1e4f
# timestamp: 2009-07-01 14:35:45 +0200
# source_branch: file:///export/home/tmp/ss156133/z/45790-50/
# base_revision_id: satya.bn@stripped
# 
# Begin bundle
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
VUCh8oA=


--===============3965414764520615268==--