Merge lp:~brianaker/drizzle/fix-equal-bad-proto-elliot into lp:drizzle/7.0

[Brian Aker]

This fixes two issues in the GA:

1) In the parser we were using wrong = for some cases of options.

2) For the replication table we used the original proto option over the one that was used in the final GA.

=== modified file 'drizzled/include.am'
--- drizzled/include.am	2011-03-08 19:26:05 +0000
+++ drizzled/include.am	2011-03-23 03:28:29 +0000
@@ -299,6 +299,7 @@
 			      drizzled/message.h \
 			      drizzled/message/cache.h \
 			      drizzled/message/catalog.h \
+			      drizzled/message/replication_options.h \
 			      drizzled/message/schema.h \
 			      drizzled/message/table.h \
 			      drizzled/module/context.h \
 
=== modified file 'drizzled/message.h'
--- drizzled/message.h	2011-03-14 05:40:28 +0000
+++ drizzled/message.h	2011-03-23 03:28:29 +0000
@@ -22,6 +22,7 @@
 
 #include <drizzled/message/table.h>
 #include <drizzled/message/schema.h>
+#include <drizzled/message/replication_options.h>
 #if 0
 #include <drizzled/message/transaction.pb.h>
 #include <google/protobuf/text_format.h>
@@ -46,23 +47,6 @@
 const std::string &type(drizzled::message::Table::ForeignKeyConstraint::ForeignKeyMatchOption type);
 const std::string &type(drizzled::message::Table::TableType type);
 
-template<class T> bool is_replicated(const T& reference)
-{
-  if (reference.has_replication_options() and
-      reference.replication_options().has_is_replicated())
-  {
-    return reference.replication_options().is_replicated();
-  }
-
-  return true;
-}
-
-template<class T> void set_is_replicated(T& reference, bool arg)
-{
-  message::ReplicationOptions *options= reference.mutable_replication_options();
-  options->set_is_replicated(arg);
-}
-
 #if 0
 std::ostream& operator<<(std::ostream& output, const message::Transaction &message);
 std::ostream& operator<<(std::ostream& output, const message::Table &message);
 
=== added file 'drizzled/message/replication_options.h'
--- drizzled/message/replication_options.h	1970-01-01 00:00:00 +0000
+++ drizzled/message/replication_options.h	2011-03-23 03:28:29 +0000
@@ -0,0 +1,47 @@
+/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2011 Brian Aker
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#pragma once
+
+#include <drizzled/message/replication_options.pb.h>
+
+namespace drizzled {
+namespace message {
+
+template<class T> bool is_replicated(const T& reference)
+{
+  if (reference.has_replication_options() and
+      reference.replication_options().has_is_replicated())
+  {
+    return reference.replication_options().is_replicated();
+  }
+
+  return true;
+}
+
+template<class T> void set_is_replicated(T& reference, bool arg)
+{
+  message::ReplicationOptions *options= reference.mutable_replication_options();
+  options->set_is_replicated(arg);
+}
+
+} /* namespace message */
+} /* namespace drizzled */
+
 
=== modified file 'drizzled/message/table.proto'
--- drizzled/message/table.proto	2011-02-16 22:38:23 +0000
+++ drizzled/message/table.proto	2011-03-23 03:28:29 +0000
@@ -35,7 +35,7 @@
     optional bool checksum = 17;
     optional bool page_checksum = 18;
     optional bool delay_key_write = 19;
-    optional bool dont_replicate = 20;
+    optional bool unused = 20;
   }
 
   message ForeignKeyConstraint {
 
=== modified file 'drizzled/sql_yacc.yy'
--- drizzled/sql_yacc.yy	2011-03-11 19:18:45 +0000
+++ drizzled/sql_yacc.yy	2011-03-23 03:28:29 +0000
@@ -991,19 +991,19 @@
             statement::CreateSchema *statement= (statement::CreateSchema *)Lex.statement;
             statement->schema_message.mutable_engine()->add_options()->set_name($1.str);
           }
-        | REPLICATE opt_equal TRUE_SYM
+        | REPLICATE '=' TRUE_SYM
           {
             parser::buildReplicationOption(&Lex, true);
           }
-        | REPLICATE opt_equal FALSE_SYM
+        | REPLICATE '=' FALSE_SYM
           {
             parser::buildReplicationOption(&Lex, false);
           }
-        | ident_or_text equal ident_or_text
+        | ident_or_text '=' ident_or_text
           {
             parser::buildSchemaOption(&Lex, $1.str, $3);
           }
-        | ident_or_text equal ulonglong_num
+        | ident_or_text '=' ulonglong_num
           {
             parser::buildSchemaOption(&Lex, $1.str, $3);
           }
@@ -1038,7 +1038,7 @@
           custom_engine_option;
 
 custom_engine_option:
-        ENGINE_SYM equal ident_or_text
+        ENGINE_SYM '=' ident_or_text
           {
             Lex.table()->mutable_engine()->set_name($3.str);
           }
@@ -1050,27 +1050,27 @@
           {
             Lex.table()->mutable_options()->set_auto_increment_value($3);
           }
-        | REPLICATE opt_equal TRUE_SYM
+        | REPLICATE '=' TRUE_SYM
           {
 	    message::set_is_replicated(*Lex.table(), true);
           }
-        | REPLICATE opt_equal FALSE_SYM
+        | REPLICATE '=' FALSE_SYM
           {
 	    message::set_is_replicated(*Lex.table(), false);
           }
-        |  ROW_FORMAT_SYM equal row_format_or_text
+        |  ROW_FORMAT_SYM '=' row_format_or_text
           {
             parser::buildEngineOption(&Lex, "ROW_FORMAT", $3);
           }
-        |  FILE_SYM equal TEXT_STRING_sys
+        |  FILE_SYM '=' TEXT_STRING_sys
           {
             parser::buildEngineOption(&Lex, "FILE", $3);
           }
-        |  ident_or_text equal engine_option_value
+        |  ident_or_text '=' engine_option_value
           {
             parser::buildEngineOption(&Lex, $1.str, $3);
           }
-        | ident_or_text equal ulonglong_num
+        | ident_or_text '=' ulonglong_num
           {
             parser::buildEngineOption(&Lex, $1.str, $3);
           }
@@ -4334,7 +4334,7 @@
 
 opt_equal:
           /* empty */ {}
-        | equal {}
+        | '=' {}
         ;
 
 no_braces:
 
=== modified file 'plugin/innobase/dict/create_replication.cc'
--- plugin/innobase/dict/create_replication.cc	2011-02-22 23:59:05 +0000
+++ plugin/innobase/dict/create_replication.cc	2011-03-23 03:28:29 +0000
@@ -128,7 +128,7 @@
   drizzled::message::Table::TableOptions *options= table_message->mutable_options();
   options->set_collation_id(drizzled::my_charset_bin.number);
   options->set_collation(drizzled::my_charset_bin.name);
-  options->set_dont_replicate(true);
+  drizzled::message::set_is_replicated(*table_message, false);
 
   drizzled::message::Table::Field *field= table_message->add_field();
   field->set_name("ID");