← Back to branch summary

~ubuntu-branches/ubuntu/utopic/mariadb-5.5/utopic-security

« back to all changes in this revision

Viewing changes to storage/innobase/dict/dict0mem.c

  • Committer: Package Import Robot
  • Author(s): Otto Kekäläinen
  • Date: 2014-08-27 21:12:36 UTC
  • mfrom: (2.1.6 sid)
  • Revision ID: package-import@ubuntu.com-20140827211236-se41hwfe4xy0hpef
http://bugs.debian.org/759309
http://bugs.debian.org/759813
* d/control: Removed Provides: libmysqlclient-dev (Closes: #759309)
* d/control: Removed Provides: libmysqld-dev with same motivation
* Re-introduced tha HPPA build patch as the upstream fix wasn't complete
* Fixed all kFreeBSD build and test suite issues
* Added Italian translation (Closes: #759813)

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/dict/dict0mem.c
66
66
{
67
67
        dict_table_t*   table;
68
68
        mem_heap_t*     heap;
 
69
        DBUG_ENTER("dict_mem_table_create");
69
70
 
70
71
        ut_ad(name);
71
72
        ut_a(!(flags & (~0 << DICT_TF2_BITS)));
98
99
        table->n_waiting_or_granted_auto_inc_locks = 0;
99
100
#endif /* !UNIV_HOTBACKUP */
100
101
 
 
102
        table->foreign_rbt = NULL;
 
103
        table->referenced_rbt = NULL;
 
104
 
101
105
        ut_d(table->magic_n = DICT_TABLE_MAGIC_N);
102
 
        return(table);
 
106
        DBUG_RETURN(table);
103
107
}
104
108
 
105
109
/****************************************************************//**
117
121
#ifndef UNIV_HOTBACKUP
118
122
        mutex_free(&(table->autoinc_mutex));
119
123
#endif /* UNIV_HOTBACKUP */
 
124
 
 
125
        if (table->foreign_rbt != NULL) {
 
126
                rbt_free(table->foreign_rbt);
 
127
        }
 
128
 
 
129
        if (table->referenced_rbt != NULL) {
 
130
                rbt_free(table->referenced_rbt);
 
131
        }
 
132
 
120
133
        ut_free(table->name);
121
134
        mem_heap_free(table->heap);
122
135
}