← Back to branch summary

~jaypipes/drizzle/proto-definitions

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Jay Pipes
  • Date: 2008-09-25 18:13:26 UTC
  • mfrom: (352.5.30 codestyle)
  • Revision ID: jay@mysql.com-20080925181326-2z7pr377hcvf28qt
Merged in trunk and added additional definition wrappers for proto buffer messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
1712
1712
    thd->enable_slow_log= opt_log_slow_admin_statements;
1713
1713
    res= mysql_repair_table(thd, first_table, &lex->check_opt);
1714
1714
    /* ! we write after unlocking the table */
1715
 
    if (!res && !lex->no_write_to_binlog)
1716
 
    {
1717
 
      /*
1718
 
        Presumably, REPAIR and binlog writing doesn't require synchronization
1719
 
      */
1720
 
      write_bin_log(thd, true, thd->query, thd->query_length);
1721
 
    }
 
1715
    /*
 
1716
      Presumably, REPAIR and binlog writing doesn't require synchronization
 
1717
    */
 
1718
    write_bin_log(thd, true, thd->query, thd->query_length);
1722
1719
    select_lex->table_list.first= (uchar*) first_table;
1723
1720
    lex->query_tables=all_tables;
1724
1721
    break;
1738
1735
    thd->enable_slow_log= opt_log_slow_admin_statements;
1739
1736
    res= mysql_analyze_table(thd, first_table, &lex->check_opt);
1740
1737
    /* ! we write after unlocking the table */
1741
 
    if (!res && !lex->no_write_to_binlog)
1742
 
    {
1743
 
      /*
1744
 
        Presumably, ANALYZE and binlog writing doesn't require synchronization
1745
 
      */
1746
 
      write_bin_log(thd, true, thd->query, thd->query_length);
1747
 
    }
 
1738
    write_bin_log(thd, true, thd->query, thd->query_length);
1748
1739
    select_lex->table_list.first= (uchar*) first_table;
1749
1740
    lex->query_tables=all_tables;
1750
1741
    break;
1756
1747
    thd->enable_slow_log= opt_log_slow_admin_statements;
1757
1748
    res= mysql_optimize_table(thd, first_table, &lex->check_opt);
1758
1749
    /* ! we write after unlocking the table */
1759
 
    if (!res && !lex->no_write_to_binlog)
1760
 
    {
1761
 
      /*
1762
 
        Presumably, OPTIMIZE and binlog writing doesn't require synchronization
1763
 
      */
1764
 
      write_bin_log(thd, true, thd->query, thd->query_length);
1765
 
    }
 
1750
    write_bin_log(thd, true, thd->query, thd->query_length);
1766
1751
    select_lex->table_list.first= (uchar*) first_table;
1767
1752
    lex->query_tables=all_tables;
1768
1753
    break;
2311
2296
    break;
2312
2297
  }
2313
2298
  case SQLCOM_RESET:
2314
 
    /*
2315
 
      RESET commands are never written to the binary log, so we have to
2316
 
      initialize this variable because RESET shares the same code as FLUSH
2317
 
    */
2318
 
    lex->no_write_to_binlog= 1;
2319
2299
  case SQLCOM_FLUSH:
2320
2300
  {
2321
2301
    bool write_to_binlog;
2333
2313
      /*
2334
2314
        Presumably, RESET and binlog writing doesn't require synchronization
2335
2315
      */
2336
 
      if (!lex->no_write_to_binlog && write_to_binlog)
2337
 
      {
2338
 
        write_bin_log(thd, false, thd->query, thd->query_length);
2339
 
      }
 
2316
      write_bin_log(thd, false, thd->query, thd->query_length);
2340
2317
      my_ok(thd);
2341
2318
    } 
2342
2319