← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Lee Bieber
  • Date: 2011-02-28 23:00:55 UTC
  • mfrom: (2208.1.4 build)
  • Revision ID: kalebral@gmail.com-20110228230055-g9cq8faquzm5cvpi
Merge Olaf - Remove Session::change_item_tree
Merge Shrew/Joe - 720908: slave will not reconnect if initial connection to master is unsuccessful
Merge Shrews - 723923: Make sleep intervals for slave plugin configurable
Merge Patrck - 726784: dbqp not properly resetting itself after a test failure 

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
932
932
            string_total_length+= new_field->pack_length();
933
933
          }
934
934
          session->mem_root= mem_root_save;
935
 
          session->change_item_tree(argp, new Item_field(new_field));
 
935
          *argp= new Item_field(new_field);
936
936
          session->mem_root= table->getMemRoot();
937
937
          if (!(new_field->flags & NOT_NULL_FLAG))
938
938
          {