← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: mordred
  • Date: 2010-04-20 00:04:22 UTC
  • mfrom: (1491 bad-staging)
  • mto: This revision was merged to the branch mainline in revision 1498.
  • Revision ID: mordred@orisndriz09-20100420000422-if6mil1596804mrj
Merged up with build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
54
54
namespace drizzled
55
55
{
56
56
 
57
 
extern plugin::StorageEngine *myisam_engine;
58
57
extern pid_t current_pid;
59
58
 
60
59
bool is_primary_key(KEY *key_info)
666
665
          {
667
666
            uint32_t cnv_errs;
668
667
            conv.copy(tmp->ptr(), tmp->length(), tmp->charset(), cs, &cnv_errs);
669
 
            interval->type_names[i]= strmake_root(session->mem_root, conv.ptr(),
670
 
                                                  conv.length());
 
668
            interval->type_names[i]= session->mem_root->strmake_root(conv.ptr(), conv.length());
671
669
            interval->type_lengths[i]= conv.length();
672
670
          }
673
671
 
1618
1616
      old_name                  The old table name.
1619
1617
      new_db                    The new database name.
1620
1618
      new_name                  The new table name.
1621
 
      flags                     flags for build_table_filename().
1622
 
                                FN_FROM_IS_TMP old_name is temporary.
1623
 
                                FN_TO_IS_TMP   new_name is temporary.
1624
1619
 
1625
1620
  RETURN
1626
1621
    false   OK
1630
1625
bool
1631
1626
mysql_rename_table(plugin::StorageEngine *base,
1632
1627
                   TableIdentifier &from,
1633
 
                   TableIdentifier &to,
1634
 
                   uint32_t )
 
1628
                   TableIdentifier &to)
1635
1629
{
1636
1630
  Session *session= current_session;
1637
1631
  int error= 0;