← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Monty Taylor
  • Date: 2009-01-29 20:42:53 UTC
  • mfrom: (819 testable)
  • mto: (779.3.19 devel)
  • mto: This revision was merged to the branch mainline in revision 823.
  • Revision ID: mordred@inaugust.com-20090129204253-9kcnyaxldhy7fyym
Merged with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
1566
1566
    open_table().
1567
1567
  */
1568
1568
  {
1569
 
    tmp_disable_binlog(session);
1570
1569
    if (!mysql_create_table_no_lock(session, create_table->db,
1571
1570
                                    create_table->table_name,
1572
1571
                                    create_info, alter_info, 0,
1612
1611
        }
1613
1612
      }
1614
1613
    }
1615
 
    reenable_binlog(session);
1616
1614
    if (!table)                                   // open failed
1617
1615
      return(0);
1618
1616
  }
1767
1765
    written to the binary log.
1768
1766
 
1769
1767
  */
1770
 
  tmp_disable_binlog(session);
1771
1768
  select_insert::send_error(errcode, err);
1772
 
  reenable_binlog(session);
1773
1769
 
1774
1770
  return;
1775
1771
}
1825
1821
    of the table succeeded or not, since we need to reset the binary
1826
1822
    log state.
1827
1823
  */
1828
 
  tmp_disable_binlog(session);
1829
1824
  select_insert::abort();
1830
1825
  session->transaction.stmt.modified_non_trans_table= false;
1831
 
  reenable_binlog(session);
1832
1826
 
1833
1827
 
1834
1828
  if (m_plock)