← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
551
551
    ::my_ok(thd, (ulong) thd->row_count_func, id, buff);
552
552
  }
553
553
  thd->abort_on_warning= 0;
554
 
  MYSQL_INSERT_END();
 
554
  DRIZZLE_INSERT_END();
555
555
  return(false);
556
556
 
557
557
abort:
560
560
  if (!joins_freed)
561
561
    free_underlaid_joins(thd, &thd->lex->select_lex);
562
562
  thd->abort_on_warning= 0;
563
 
  MYSQL_INSERT_END();
 
563
  DRIZZLE_INSERT_END();
564
564
  return(true);
565
565
}
566
566
 
1542
1542
      items        in     List of items which should be used to produce rest
1543
1543
                          of fields for the table (corresponding fields will
1544
1544
                          be added to the end of alter_info->create_list)
1545
 
      lock         out    Pointer to the MYSQL_LOCK object for table created
 
1545
      lock         out    Pointer to the DRIZZLE_LOCK object for table created
1546
1546
                          (or open temporary table) will be returned in this
1547
1547
                          parameter. Since this table is not included in
1548
1548
                          THD::lock caller is responsible for explicitly
1572
1572
                                      TABLE_LIST *create_table,
1573
1573
                                      Alter_info *alter_info,
1574
1574
                                      List<Item> *items,
1575
 
                                      MYSQL_LOCK **lock,
 
1575
                                      DRIZZLE_LOCK **lock,
1576
1576
                                      TABLEOP_HOOKS *hooks)
1577
1577
{
1578
1578
  TABLE tmp_table;              // Used during 'Create_field()'
1689
1689
      else
1690
1690
      {
1691
1691
        if (!(table= open_table(thd, create_table, thd->mem_root, (bool*) 0,
1692
 
                                MYSQL_OPEN_TEMPORARY_ONLY)) &&
 
1692
                                DRIZZLE_OPEN_TEMPORARY_ONLY)) &&
1693
1693
            !create_info->table_existed)
1694
1694
        {
1695
1695
          /*
1709
1709
  table->reginfo.lock_type=TL_WRITE;
1710
1710
  hooks->prelock(&table, 1);                    // Call prelock hooks
1711
1711
  if (! ((*lock)= mysql_lock_tables(thd, &table, 1,
1712
 
                                    MYSQL_LOCK_IGNORE_FLUSH, &not_used)) ||
 
1712
                                    DRIZZLE_LOCK_IGNORE_FLUSH, &not_used)) ||
1713
1713
        hooks->postlock(&table, 1))
1714
1714
  {
1715
1715
    if (*lock)
1729
1729
int
1730
1730
select_create::prepare(List<Item> &values, SELECT_LEX_UNIT *u)
1731
1731
{
1732
 
  MYSQL_LOCK *extra_lock= NULL;
 
1732
  DRIZZLE_LOCK *extra_lock= NULL;
1733
1733
  
1734
1734
 
1735
1735
  TABLEOP_HOOKS *hook_ptr= NULL;