List:Commits« Previous MessageNext Message »
From:Luis Soares Date:February 21 2012 1:09am
Subject:bzr push into mysql-trunk-wl3584 branch (luis.soares:3658 to 3659)
View as plain text  
 3659 Luis Soares	2012-02-21 [merge]
      Automerged from mysql-trunk --> mysql-trunk-wl3584.

    modified:
      libmysql/CMakeLists.txt
      mysql-test/r/innodb_ignore_builtin.result
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysql-test/t/innodb_ignore_builtin.test
 3658 Andrei Elkin	2012-02-21
      wl#3584 GTID
      
      relaxing conditions for HB info validation.
      Master can skip transactions that slave already got and this
      fact is never reported so the vanilla GTID-less logics
      fail because implicitly MI.pos should include the size of the
      skipped transactions.
      
      Until HB does not carry the skipped size validation only 
      condiders monotonicity, i.e
      HB.pos >= MI.pos when gtid_mode is ON.

    modified:
      sql/rpl_slave.cc
=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2012-02-17 10:30:31 +0000
+++ b/libmysql/CMakeLists.txt	2012-02-20 13:27:26 +0000
@@ -150,6 +150,17 @@ SET(CLIENT_SOURCES
   ../sql/password.c
   ../sql/my_rnd.cc
 )
+
+# We do RESTRICT_SYMBOL_EXPORTS(yassl) elsewhere.
+# In order to get correct symbol visibility, md5.cc and sha1.cc
+# must be compiled with "-fvisibility=hidden"
+IF(HAVE_VISIBILITY_HIDDEN)
+  SET_SOURCE_FILES_PROPERTIES(../sql/md5.cc
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+  SET_SOURCE_FILES_PROPERTIES(../sql/sha1.cc
+    PROPERTIES COMPILE_FLAGS "-fvisibility=hidden")
+ENDIF()
+
 ADD_CONVENIENCE_LIBRARY(clientlib ${CLIENT_SOURCES})
 DTRACE_INSTRUMENT(clientlib)
 ADD_DEPENDENCIES(clientlib GenError)

=== modified file 'mysql-test/r/innodb_ignore_builtin.result'
--- a/mysql-test/r/innodb_ignore_builtin.result	2009-02-09 15:03:52 +0000
+++ b/mysql-test/r/innodb_ignore_builtin.result	2012-02-20 11:54:49 +0000
@@ -1,9 +1,12 @@
+call mtr.add_suppression("is ignored and will be removed in future releases");
 show variables like 'ignore_builtin_innodb';
 Variable_name	Value
 ignore_builtin_innodb	ON
 select PLUGIN_NAME from information_schema.plugins
 where PLUGIN_NAME = "InnoDb";
 PLUGIN_NAME
+InnoDB
 select ENGINE from information_schema.engines
 where ENGINE = "InnoDB";
 ENGINE
+InnoDB

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2012-02-16 18:19:43 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2012-02-21 01:08:50 +0000
@@ -204,6 +204,7 @@ The following options may be given as th
  enabled. Can be ON or OFF.
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
+ IGNORED. This option will be removed in future releases.
  Disable initialization of builtin InnoDB plugin
  --ignore-db-dir=name 
  Specifies a directory to add to the ignore list when

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-02-16 22:05:03 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-02-21 01:08:50 +0000
@@ -204,6 +204,7 @@ The following options may be given as th
  enabled. Can be ON or OFF.
  -?, --help          Display this help and exit.
  --ignore-builtin-innodb 
+ IGNORED. This option will be removed in future releases.
  Disable initialization of builtin InnoDB plugin
  --ignore-db-dir=name 
  Specifies a directory to add to the ignore list when

=== modified file 'mysql-test/t/innodb_ignore_builtin.test'
--- a/mysql-test/t/innodb_ignore_builtin.test	2009-02-09 15:03:52 +0000
+++ b/mysql-test/t/innodb_ignore_builtin.test	2012-02-20 11:54:49 +0000
@@ -1,6 +1,12 @@
 #
 # Bug #42610:  Dynamic plugin broken in 5.1.31
 #
+# ignore_builtin_innodb is ignored in MySQL 5.6 (start with InnoDB regardless
+# of the value of that option).
+#
+
+call mtr.add_suppression("is ignored and will be removed in future releases");
+
 show variables like 'ignore_builtin_innodb';
 select PLUGIN_NAME from information_schema.plugins
 where PLUGIN_NAME = "InnoDb";

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl3584 branch (luis.soares:3658 to 3659) Luis Soares21 Feb