List:Commits« Previous MessageNext Message »
From:Magnus Blåudd Date:November 24 2010 1:13pm
Subject:bzr push into mysql-trunk-bugfixing branch (magnus.blaudd:3392 to 3393)
View as plain text  
 3393 Magnus Blåudd	2010-11-24 [merge]
      Merge 5.5-bug57736 into trunk-bugfixing

    modified:
      client/client_priv.h
 3392 Magnus Blåudd	2010-11-24 [merge]
      Merge

    modified:
      cmake/mysql_version.cmake
      cmake/plugin.cmake
      libmysqld/CMakeLists.txt
      sql/sql_priv.h
=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2010-10-04 15:25:10 +0000
+++ b/client/client_priv.h	2010-11-24 13:09:52 +0000
@@ -50,9 +50,6 @@ enum options_client
   OPT_OPEN_FILES_LIMIT, OPT_SET_CHARSET, OPT_SERVER_ARG,
   OPT_STOP_POSITION, OPT_START_DATETIME, OPT_STOP_DATETIME,
   OPT_SIGINT_IGNORE, OPT_HEXBLOB, OPT_ORDER_BY_PRIMARY, OPT_COUNT,
-#ifdef HAVE_NDBCLUSTER_DB
-  OPT_NDBCLUSTER, OPT_NDB_CONNECTSTRING,
-#endif
   OPT_TRIGGERS,
   OPT_MYSQL_ONLY_PRINT,
   OPT_MYSQL_LOCK_DIRECTORY,

No bundle (reason: useless for push emails).
Thread
• bzr push into mysql-trunk-bugfixing branch (magnus.blaudd:3392 to 3393) Magnus Blåudd24 Nov