← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/lock.cc

  • Committer: Brian Aker
  • Date: 2010-07-29 02:28:38 UTC
  • mfrom: (1669.3.10 rollup)
  • Revision ID: brian@gaz-20100729022838-7x19p93dq8l36ejb
Rollup of patch from Brian. Includes malloc -> new for Table, and
modifications to make boost::unordered use for strings a version which
does the automagic for case.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
612
612
      *write_lock_used=table;
613
613
      if (table->db_stat & HA_READ_ONLY)
614
614
      {
615
 
        my_error(ER_OPEN_AS_READONLY,MYF(0),table->alias);
 
615
        my_error(ER_OPEN_AS_READONLY, MYF(0), table->getAlias());
616
616
        /* Clear the lock type of the lock data that are stored already. */
617
617
        sql_lock->lock_count= locks - sql_lock->locks;
618
618
        reset_lock_data_and_free(&sql_lock);