Merge lp:~dshrews/drizzle/bug726741_block_flush_analyze into lp:drizzle/7.0

[David Shrewsbury]

Do not pass FLUSH or ANALYZE statements through the replication stream.

=== modified file 'drizzled/statement/analyze.cc'
--- drizzled/statement/analyze.cc	2011-02-21 18:33:47 +0000
+++ drizzled/statement/analyze.cc	2011-02-28 20:21:25 +0000
@@ -34,8 +34,6 @@
   assert(first_table == all_tables && first_table != 0);
   Select_Lex *select_lex= &getSession()->getLex()->select_lex;
   bool res= analyze_table(getSession(), first_table, &check_opt);
-  /* ! we write after unlocking the table */
-  write_bin_log(getSession(), *getSession()->getQueryString());
   select_lex->table_list.first= (unsigned char*) first_table;
   getSession()->getLex()->query_tables= all_tables;
 

=== modified file 'drizzled/statement/flush.cc'
--- drizzled/statement/flush.cc	2011-02-21 18:33:47 +0000
+++ drizzled/statement/flush.cc	2011-02-28 20:21:25 +0000
@@ -39,13 +39,6 @@
    */
   if (not reloadCache())
   {
-    /*
-     * We WANT to write and we CAN write.
-     * ! we write after unlocking the table.
-     *
-     * Presumably, RESET and binlog writing doesn't require synchronization
-     */
-    write_bin_log(getSession(), *getSession()->getQueryString());
     getSession()->my_ok();
   }