MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jon Olav Hauglid Date:April 22 2010 7:31am
Subject:bzr push into mysql-trunk-runtime branch (jon.hauglid:3006 to 3007)
View as plain text  
 3007 Jon Olav Hauglid	2010-04-22 [merge]
      merge from mysql-trunk-bugfixing

    modified:
      .bzrignore
      mysql-test/include/commit.inc
      mysql-test/r/commit_1innodb.result
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/t/ctype_cp932_binlog_stm.test
      mysql-test/t/mysqlbinlog.test
      sql/item_strfunc.cc
 3006 Jon Olav Hauglid	2010-04-21 [merge]
      merge from mysql-trunk-bugfixing

    removed:
      sql/mysql_priv.h.pp
    added:
      mysql-test/suite/rpl/r/rpl_temp_temporary.result
      mysql-test/suite/rpl/t/rpl_temp_temporary.test
    modified:
      Makefile.am
      cmake/abi_check.cmake
      include/mysql/innodb_priv.h
      mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
      mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test
      mysql-test/extra/rpl_tests/rpl_innodb.test
      mysql-test/extra/rpl_tests/rpl_loaddata.test
      mysql-test/include/ctype_utf8_table.inc
      mysql-test/r/ctype_cp932_binlog_stm.result
      mysql-test/suite/binlog/r/binlog_database.result
      mysql-test/suite/binlog/r/binlog_innodb_row.result
      mysql-test/suite/binlog/r/binlog_multi_engine.result
      mysql-test/suite/binlog/r/binlog_row_binlog.result
      mysql-test/suite/binlog/r/binlog_row_drop_tmp_tbl.result
      mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
      mysql-test/suite/binlog/r/binlog_stm_binlog.result
      mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
      mysql-test/suite/binlog/t/binlog_tmp_table.test
      mysql-test/suite/ndb/r/ndb_binlog_format.result
      mysql-test/suite/rpl/r/rpl_concurrency_error.result
      mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_mixed_row_innodb.result
      mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_row_drop.result
      mysql-test/suite/rpl/r/rpl_row_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_row_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
      mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result
      mysql-test/suite/rpl/r/rpl_stm_innodb.result
      mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
      mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
      mysql-test/suite/rpl/t/rpl000013.test
      mysql-test/suite/rpl/t/rpl_misc_functions.test
      mysql-test/suite/rpl/t/rpl_temp_table.test
      mysql-test/suite/rpl/t/rpl_temporary.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_row_implicit_commit_binlog.result
      mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb.result
      mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb.test
      mysql-test/t/create_select_tmp.test
      mysql-test/t/ctype_cp932_binlog_stm.test
      mysql-test/t/mysqlbinlog.test
      sql/log.cc
      sql/log.h
      sql/log_event.cc
      sql/log_event_old.cc
      sql/share/errmsg-utf8.txt
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_priv.h
      sql/sql_table.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/i_s.cc
=== modified file '.bzrignore'
--- a/.bzrignore	2010-04-13 15:04:45 +0000
+++ b/.bzrignore	2010-04-21 19:59:19 +0000
@@ -3084,3 +3084,4 @@ libmysqld/keycaches.cc
 client/dtoa.c
 libmysqld/sql_audit.cc
 configure.am
+libmysqld/des_key_file.cc

=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2010-02-04 22:08:08 +0000
+++ b/mysql-test/include/commit.inc	2010-04-21 13:28:00 +0000
@@ -640,9 +640,9 @@ call p_verify_status_increment(2, 0, 1, 
 --echo # 25. DDL: DROP TEMPORARY TABLE, does not start a transaction
 --echo #
 drop temporary table t2;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 commit;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 
 --echo # 26. Verify that SET AUTOCOMMIT issues an implicit commit
 --echo #

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2010-02-04 22:08:08 +0000
+++ b/mysql-test/r/commit_1innodb.result	2010-04-21 13:28:00 +0000
@@ -709,11 +709,11 @@ SUCCESS
 # 25. DDL: DROP TEMPORARY TABLE, does not start a transaction
 #
 drop temporary table t2;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 SUCCESS
 
 commit;
-call p_verify_status_increment(1, 0, 0, 0);
+call p_verify_status_increment(1, 0, 1, 0);
 SUCCESS
 
 # 26. Verify that SET AUTOCOMMIT issues an implicit commit

=== modified file 'mysql-test/r/ctype_cp932_binlog_stm.result'
--- a/mysql-test/r/ctype_cp932_binlog_stm.result	2010-04-20 09:10:43 +0000
+++ b/mysql-test/r/ctype_cp932_binlog_stm.result	2010-04-21 13:28:00 +0000
@@ -78,11 +78,7 @@ CREATE TABLE t1 (b VARCHAR(2));
 INSERT INTO t1 VALUES ('0'),('1'),('2'),('3'),('4'),('5'),('6'),('7');
 INSERT INTO t1 VALUES ('8'),('9'),('A'),('B'),('C'),('D'),('E'),('F');
 CREATE TEMPORARY TABLE head AS SELECT concat(b1.b, b2.b) AS head FROM t1 b1, t1 b2;
-Warnings:
-Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Statements that read from both transactional (or a temporary table of any engine type) and non-transactional tables and write to any of them are unsafe.
 CREATE TEMPORARY TABLE tail AS SELECT concat(b1.b, b2.b) AS tail FROM t1 b1, t1 b2;
-Warnings:
-Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Statements that read from both transactional (or a temporary table of any engine type) and non-transactional tables and write to any of them are unsafe.
 DROP TABLE t1;
 CREATE TABLE t1 AS
 SELECT concat(head, tail) AS code, ' ' AS a

=== modified file 'mysql-test/t/ctype_cp932_binlog_stm.test'
--- a/mysql-test/t/ctype_cp932_binlog_stm.test	2010-04-20 09:10:43 +0000
+++ b/mysql-test/t/ctype_cp932_binlog_stm.test	2010-04-21 13:28:00 +0000
@@ -64,8 +64,10 @@ INSERT INTO t1 VALUES ('8'),('9'),('A'),
 #
 # Populate tables head and tail with values '00'-'FF'
 #
+--disable_warnings
 CREATE TEMPORARY TABLE head AS SELECT concat(b1.b, b2.b) AS head FROM t1 b1, t1 b2;
 CREATE TEMPORARY TABLE tail AS SELECT concat(b1.b, b2.b) AS tail FROM t1 b1, t1 b2;
+--enable_warnings
 DROP TABLE t1;
 #
 # Populate table t1 with all codes [80..FF][20..FF]

=== modified file 'mysql-test/t/mysqlbinlog.test'
--- a/mysql-test/t/mysqlbinlog.test	2010-04-20 09:10:43 +0000
+++ b/mysql-test/t/mysqlbinlog.test	2010-04-21 13:28:00 +0000
@@ -145,7 +145,14 @@ EOF
 # must be digestable for both client and server. In 4.1 the client
 # should use default-character-set same as the server.
 flush logs;
---exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL
+# Due to BUG#18337 that wrongly suppresses the BINLOG EVENTS when
+# --short-form is used, the "insert into t5 select * from `���"
+# which is unsafe and thus written to the binary log in the row
+# format is not executed. This makes the assertion select * from t5 
+# /* must be (1),(1) */; to fail. To temporary fix the bug, we
+# removed the option --short-form.
+#--exec $MYSQL_BINLOG --short-form $MYSQLD_DATADIR/master-bin.000004 | $MYSQL
+--exec $MYSQL_BINLOG $MYSQLD_DATADIR/master-bin.000004 | $MYSQL
 select * from t5  /* must be (1),(1) */;
 drop table t5;
 

=== modified file 'sql/item_strfunc.cc'
--- a/sql/item_strfunc.cc	2010-04-13 15:04:45 +0000
+++ b/sql/item_strfunc.cc	2010-04-21 19:58:54 +0000
@@ -29,6 +29,13 @@
 #pragma implementation				// gcc: Class implementation
 #endif
 
+/*
+  NOTE: zlib.h must be included *before* my_global.h because my_global.h
+  may undef some HAVE_ macros. Including zlib.h after my_global.h may lead
+  to re-defining undefined macros, thus to compile errors.
+*/
+#include <zlib.h>                               // Must be before my_global.h
+
 /* May include caustic 3rd-party defs. Use early, so it can override nothing. */
 #include "sha2.h"
 #include "my_global.h"                          // HAVE_*
@@ -51,7 +58,6 @@
 #include "my_md5.h"
 #include "sha1.h"
 #include "my_aes.h"
-#include <zlib.h>
 C_MODE_START
 #include "../mysys/my_static.h"			// For soundex_map
 C_MODE_END

Attachment: [text/bzr-bundle] bzr/jon.hauglid@sun.com-20100422073033-0xkun2y1hf7yv5tg.bundle
Thread
bzr push into mysql-trunk-runtime branch (jon.hauglid:3006 to 3007) Jon Olav Hauglid22 Apr