From 42a3ff3f99c0e7851697420834edb2dc9e74a3ba Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Tue, 14 Mar 2006 14:51:48 +0100
Subject: [PATCH 1/2] Bug#18195 MySQL on Windows not built with YaSSL correctly
  - Add HAVE_OPENSSL and HAVE_YASSL to config-win.h

---
 include/config-win.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/config-win.h b/include/config-win.h
index cccd660efec..6dbfae1716e 100644
--- a/include/config-win.h
+++ b/include/config-win.h
@@ -413,8 +413,8 @@ inline double ulonglong2double(ulonglong value)
 #define HAVE_SPATIAL 1
 #define HAVE_RTREE_KEYS 1
 
-/* #undef HAVE_OPENSSL */
-/* #undef HAVE_YASSL */
+#define HAVE_OPENSSL 1
+#define HAVE_YASSL 1
 
 /* Define charsets you want */
 /* #undef HAVE_CHARSET_armscii8 */

From 8b2fd13d30543610f977c592a7391fa91e31fe0d Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Wed, 15 Mar 2006 16:29:25 +0100
Subject: [PATCH 2/2] Bug#18208 SBR fails to replicate auto_increment values
 for Cluster  - Replication of tables with autoincrement not supported when
 maste and or slave uses storage engine "ndb"

---
 mysql-test/t/disabled.def               | 1 -
 mysql-test/t/rpl_ndb_multi_update2.test | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 9bd7a42e8de..aa4b7ecaa17 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -38,4 +38,3 @@ rpl_ndb_sp007           : Bug #17290
 rpl_sp                  : Bug#16456
 rpl_until               : Unstable test case, bug#15886
 sp-goto                 : GOTO is currently is disabled - will be fixed in the future
-rpl_ndb_multi_update2   : BUG#17738 In progress
diff --git a/mysql-test/t/rpl_ndb_multi_update2.test b/mysql-test/t/rpl_ndb_multi_update2.test
index d337ddfe88a..df4f0eec39d 100644
--- a/mysql-test/t/rpl_ndb_multi_update2.test
+++ b/mysql-test/t/rpl_ndb_multi_update2.test
@@ -3,5 +3,10 @@
 # to reuse test code between engine runs                   #
 ############################################################
 -- source include/have_ndb.inc
+
+# Run this only for row based replication, as replication of
+# auto_increment values are not supported with NDB as storage engine
+-- source include/have_binlog_format_row.inc
+
 let $engine_type=NDB;
 --source extra/rpl_tests/rpl_multi_update2.test