← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/handler/ha_innodb.cc

  • Committer: Monty Taylor
  • Date: 2008-10-06 01:30:47 UTC
  • Revision ID: monty@inaugust.com-20081006013047-6m2ejc0c4peye2k9
Removed my_free(). It turns out that it had been def'd to ignore the flags passed to it in the second arg anyway. Gotta love that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
1265
1265
                                namelen = filename_to_tablename(temp_name,
1266
1266
                                                qname, qnamelen);
1267
1267
                        }
1268
 
                        my_free(temp_name, MYF(0));
 
1268
                        free(temp_name);
1269
1269
                }
1270
1270
        }
1271
1271
 
1292
1292
                putc(q, f);
1293
1293
        }
1294
1294
 
1295
 
        my_free(qname, MYF(MY_ALLOW_ZERO_PTR));
 
1295
        free(qname);
1296
1296
}
1297
1297
 
1298
1298
/**************************************************************************
1514
1514
        if (ret == FALSE) {
1515
1515
                sql_print_error(
1516
1516
                        "InnoDB: syntax error in innodb_data_file_path");
1517
 
                my_free(internal_innobase_data_file_path,
1518
 
                                                MYF(MY_ALLOW_ZERO_PTR));
 
1517
                if (internal_innobase_data_file_path)
 
1518
                        free(internal_innobase_data_file_path);
1519
1519
                goto error;
1520
1520
        }
1521
1521
 
1545
1545
          sql_print_error("syntax error in innodb_log_group_home_dir, or a "
1546
1546
                          "wrong number of mirrored log groups");
1547
1547
 
1548
 
                my_free(internal_innobase_data_file_path,
1549
 
                                                MYF(MY_ALLOW_ZERO_PTR));
 
1548
                if (internal_innobase_data_file_path)
 
1549
                        free(internal_innobase_data_file_path);
1550
1550
                goto error;
1551
1551
        }
1552
1552
 
1626
1626
        err = innobase_start_or_create_for_mysql();
1627
1627
 
1628
1628
        if (err != DB_SUCCESS) {
1629
 
                my_free(internal_innobase_data_file_path,
1630
 
                                                MYF(MY_ALLOW_ZERO_PTR));
 
1629
                if (internal_innobase_data_file_path)
 
1630
                        free(internal_innobase_data_file_path);
1631
1631
                goto error;
1632
1632
        }
1633
1633
 
1663
1663
                        err = 1;
1664
1664
                }
1665
1665
                hash_free(&innobase_open_tables);
1666
 
                my_free(internal_innobase_data_file_path,
1667
 
                                                MYF(MY_ALLOW_ZERO_PTR));
 
1666
                if (internal_innobase_data_file_path)
 
1667
                        free(internal_innobase_data_file_path);
1668
1668
                pthread_mutex_destroy(&innobase_share_mutex);
1669
1669
                pthread_mutex_destroy(&prepare_commit_mutex);
1670
1670
                pthread_mutex_destroy(&commit_threads_m);
2266
2266
                                "how you can resolve the problem.\n",
2267
2267
                                norm_name);
2268
2268
                free_share(share);
2269
 
                my_free(upd_buff, MYF(0));
 
2269
                free(upd_buff);
2270
2270
                my_errno = ENOENT;
2271
2271
 
2272
2272
                return(HA_ERR_NO_SUCH_TABLE);
2282
2282
                                "how you can resolve the problem.\n",
2283
2283
                                norm_name);
2284
2284
                free_share(share);
2285
 
                my_free(upd_buff, MYF(0));
 
2285
                free(upd_buff);
2286
2286
                my_errno = ENOENT;
2287
2287
 
2288
2288
                dict_table_decrement_handle_count(ib_table);
2387
2387
 
2388
2388
        row_prebuilt_free(prebuilt);
2389
2389
 
2390
 
        my_free(upd_buff, MYF(0));
 
2390
        free(upd_buff);
2391
2391
        free_share(share);
2392
2392
 
2393
2393
        /* Tell InnoDB server that there might be work for
4715
4715
 
4716
4716
        error = convert_error_code_to_mysql(error, NULL);
4717
4717
 
4718
 
        my_free(field_lengths, MYF(0));
 
4718
        free(field_lengths);
4719
4719
 
4720
4720
        return(error);
4721
4721
}
5166
5166
        }
5167
5167
 
5168
5168
        error = row_drop_database_for_mysql(namebuf, trx);
5169
 
        my_free(namebuf, MYF(0));
 
5169
        free(namebuf);
5170
5170
 
5171
5171
        /* Flush the log to reduce probability that the .frm files and
5172
5172
        the InnoDB data dictionary get out-of-sync if the user runs
5351
5351
        dtuple_free_for_mysql(heap1);
5352
5352
        dtuple_free_for_mysql(heap2);
5353
5353
 
5354
 
        my_free(key_val_buff2, MYF(0));
 
5354
        free(key_val_buff2);
5355
5355
 
5356
5356
        prebuilt->trx->op_info = (char*)"";
5357
5357
 
6075
6075
        char*   str)    /* in, own: create info string to free  */
6076
6076
{
6077
6077
        if (str) {
6078
 
                my_free(str, MYF(0));
 
6078
                free(str);
6079
6079
        }
6080
6080
}
6081
6081
 
6613
6613
                        STRING_WITH_LEN(""), str, flen)) {
6614
6614
                result= TRUE;
6615
6615
        }
6616
 
        my_free(str, MYF(0));
 
6616
        free(str);
6617
6617
 
6618
6618
        return(FALSE);
6619
6619
}
6767
6767
                if (my_hash_insert(&innobase_open_tables,
6768
6768
                                (uchar*) share)) {
6769
6769
                        pthread_mutex_unlock(&innobase_share_mutex);
6770
 
                        my_free(share,0);
 
6770
                        free(share);
6771
6771
 
6772
6772
                        return 0;
6773
6773
                }
6790
6790
                hash_delete(&innobase_open_tables, (uchar*) share);
6791
6791
                thr_lock_delete(&share->lock);
6792
6792
                pthread_mutex_destroy(&share->mutex);
6793
 
                my_free(share, MYF(0));
 
6793
                free(share);
6794
6794
        }
6795
6795
 
6796
6796
        pthread_mutex_unlock(&innobase_share_mutex);