bzr commit into mysql-5.1-telco-6.3 branch (magnus.blaudd:3304)

[Magnus Blåudd]

#At file:///home/msvensson/mysql/6.3/ based on revid:magnus.blaudd@stripped

 3304 Magnus Blåudd	2010-10-18
      ndb
       - mark one more place as being part of WL342

    modified:
      sql/lex.h
=== modified file 'sql/lex.h'
--- a/sql/lex.h	2010-10-18 09:33:24 +0000
+++ b/sql/lex.h	2010-10-18 11:21:36 +0000
@@ -330,7 +330,9 @@ static SYMBOL symbols[] = {
   { "MASTER_SSL_KEY",   SYM(MASTER_SSL_KEY_SYM)},
   { "MASTER_SSL_VERIFY_SERVER_CERT", SYM(MASTER_SSL_VERIFY_SERVER_CERT_SYM)},
   { "MASTER_USER",           SYM(MASTER_USER_SYM)},
+#ifndef MCP_WL342
   { "MASTER_HEARTBEAT_PERIOD", SYM(MASTER_HEARTBEAT_PERIOD_SYM)},
+#endif
   { "MATCH",		SYM(MATCH)},
   { "MAX_CONNECTIONS_PER_HOUR", SYM(MAX_CONNECTIONS_PER_HOUR)},
   { "MAX_QUERIES_PER_HOUR", SYM(MAX_QUERIES_PER_HOUR)},

Attachment: [text/bzr-bundle] bzr/[e-mail]