bzr push into mysql-5.1-bugteam branch (staale.smedseng:2989 to 2990)

[Staale Smedseng]

 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;
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]