MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:Jonathan Perkin Date:September 30 2009 2:48pm
Subject:bzr commit into mysql-5.0-bugteam branch (jperkin:2819) Bug#27693
View as plain text  
#At file:///home/sketch/bzr/mysql-bug27693/ based on revid:jperkin@stripped

 2819 Jonathan Perkin	2009-09-30
      bug#27693: Windows compilation from bk fails using WITH_BERKELEY_STORAGE_ENGINE
      
      Make configure.js bail with an error if trying to build bdb from a bzr
      tree.

    modified:
      win/configure.js
=== modified file 'win/configure.js'

=== modified file 'win/configure.js'
--- a/win/configure.js	2009-05-20 21:04:34 +0000
+++ b/win/configure.js	2009-09-30 14:46:51 +0000
@@ -41,7 +41,6 @@
         {
             case "WITH_COMMUNITY_FEATURES":
             case "WITH_ARCHIVE_STORAGE_ENGINE":
-            case "WITH_BERKELEY_STORAGE_ENGINE":
             case "WITH_BLACKHOLE_STORAGE_ENGINE":
             case "WITH_EXAMPLE_STORAGE_ENGINE":
             case "WITH_FEDERATED_STORAGE_ENGINE":
@@ -51,6 +50,21 @@
             case "EMBED_MANIFESTS":
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
                     break;
+            // BDB includes auto-generated files which are not handled by
+            // cmake, so only allow this option if building from a source
+            // distribution
+            case "WITH_BERKELEY_STORAGE_ENGINE":
+                if (!fso.FileExists("bdb\\btree\\btree_auto.c"))
+                {
+                    BDBSourceError = new Error("BDB cannot be built directly" +
+                      " from a bzr tree, see comment in bdb\\CMakeLists.txt");
+                    throw BDBSourceError;
+                }
+                else
+                {
+                    configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
+                    break;
+                }
             case "MYSQL_SERVER_SUFFIX":
             case "MYSQLD_EXE_SUFFIX":
                     configfile.WriteLine("SET (" + parts[0] + " \""


Attachment: [text/bzr-bundle] bzr/jperkin@sun.com-20090930144651-yb58ceavhr9b1b1r.bundle
Thread
bzr commit into mysql-5.0-bugteam branch (jperkin:2819) Bug#27693Jonathan Perkin30 Sep