← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/dict/dict0dict.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 01:32:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226013211-c1tx52h7evovmijg
fixed dict and eval.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/dict/dict0dict.cc
2063
2063
        }
2064
2064
 
2065
2065
        /* Remember the table columns already contained in new_index */
2066
 
        indexed = static_cast<unsigned long *>(mem_zalloc(table->n_cols * sizeof *indexed));
 
2066
        void *indexed_ptr= mem_zalloc(table->n_cols * sizeof *indexed);
 
2067
        indexed = static_cast<unsigned long *>(indexed_ptr);
2067
2068
 
2068
2069
        /* Mark the table columns already contained in new_index */
2069
2070
        for (i = 0; i < new_index->n_def; i++) {
2147
2148
        dict_index_copy(new_index, index, table, 0, index->n_fields);
2148
2149
 
2149
2150
        /* Remember the table columns already contained in new_index */
2150
 
        indexed = static_cast<unsigned long *>(mem_zalloc(table->n_cols * sizeof *indexed));
 
2151
        void *indexed_ptr= mem_zalloc(table->n_cols * sizeof *indexed);
 
2152
        indexed = static_cast<unsigned long *>(indexed_ptr);
2151
2153
 
2152
2154
        /* Mark the table columns already contained in new_index */
2153
2155
        for (i = 0; i < new_index->n_def; i++) {
3876
3878
 
3877
3879
        *n = 0;
3878
3880
 
3879
 
        *constraints_to_drop = mem_heap_alloc(heap, 1000 * sizeof(char*));
 
3881
        *constraints_to_drop = static_cast<const char **>(mem_heap_alloc(heap, 1000 * sizeof(char*)));
3880
3882
 
3881
3883
        ptr = innobase_get_stmt(trx->mysql_thd, &len);
3882
3884