← 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: 2008-12-05 03:17:16 UTC
  • mfrom: (641.3.11 devel)
  • Revision ID: brian@tangent.org-20081205031716-r65xkzugjylmvv1h
Monty merge (a couple of alterations for malloc()).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/lock.cc
69
69
  in case external_lock() fails.
70
70
 
71
71
  @todo
72
 
  Change to use my_malloc() ONLY when using LOCK TABLES command or when
 
72
  Change to use malloc() ONLY when using LOCK TABLES command or when
73
73
  we are forced to use mysql_lock_merge.
74
74
*/
75
75
#include <drizzled/server_includes.h>
577
577
  Table **table, **end_table;
578
578
 
579
579
  if (!(sql_lock= (DRIZZLE_LOCK*)
580
 
        my_malloc(sizeof(*sql_lock)+
581
 
                  sizeof(THR_LOCK_DATA*)*(a->lock_count+b->lock_count)+
582
 
                  sizeof(Table*)*(a->table_count+b->table_count),MYF(MY_WME))))
 
580
        malloc(sizeof(*sql_lock)+
 
581
               sizeof(THR_LOCK_DATA*)*(a->lock_count+b->lock_count)+
 
582
               sizeof(Table*)*(a->table_count+b->table_count))))
583
583
    return(0);                          // Fatal error
584
584
  sql_lock->lock_count=a->lock_count+b->lock_count;
585
585
  sql_lock->table_count=a->table_count+b->table_count;
777
777
    from the first part immediately before calling thr_multi_lock().
778
778
  */
779
779
  if (!(sql_lock= (DRIZZLE_LOCK*)
780
 
        my_malloc(sizeof(*sql_lock) +
781
 
                  sizeof(THR_LOCK_DATA*) * tables * 2 +
782
 
                  sizeof(table_ptr) * lock_count,
783
 
                  MYF(0))))
 
780
        malloc(sizeof(*sql_lock) +
 
781
               sizeof(THR_LOCK_DATA*) * tables * 2 +
 
782
               sizeof(table_ptr) * lock_count)))
784
783
    return(0);
785
784
  locks= locks_buf= sql_lock->locks= (THR_LOCK_DATA**) (sql_lock + 1);
786
785
  to= table_buf= sql_lock->table= (Table**) (locks + tables * 2);