← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.cc

  • Committer: Jay Pipes
  • Date: 2009-01-28 08:45:05 UTC
  • mfrom: (814 testable)
  • mto: This revision was merged to the branch mainline in revision 815.
  • Revision ID: jpipes@serialcoder-20090128084505-smcxk30skihts3my
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/session.cc
549
549
            (hash_get_key) get_var_key,
550
550
            (hash_free_key) free_user_var, 0);
551
551
 
552
 
  /* For user vars replication*/
553
 
  if (opt_bin_log)
554
 
    my_init_dynamic_array(&user_var_events,
555
 
                          sizeof(BINLOG_USER_VAR_EVENT *), 16, 16);
556
 
  else
557
 
    memset(&user_var_events, 0, sizeof(user_var_events));
558
 
 
559
552
  /* Protocol */
560
553
  protocol= &protocol_text;                     // Default protocol
561
554
  protocol_text.init(this);
724
717
    close_thread_tables(this);
725
718
  }
726
719
  mysql_ha_cleanup(this);
727
 
  delete_dynamic(&user_var_events);
728
720
  hash_free(&user_vars);
729
721
  close_temporary_tables();
730
722
  free((char*) variables.time_format);
2567
2559
  }
2568
2560
  thread_specific_used= false;
2569
2561
 
2570
 
  if (opt_bin_log)
2571
 
  {
2572
 
    reset_dynamic(&user_var_events);
2573
 
    user_var_events_alloc= mem_root;
2574
 
  }
2575
2562
  clear_error();
2576
2563
  main_da.reset_diagnostics_area();
2577
2564
  total_warn_count=0;                   // Warnings for this query