← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_db.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:
drizzled/sql_db.cc
80
80
 
81
81
void lock_db_free_element(void *ptr)
82
82
{
83
 
  my_free(ptr, MYF(0));
 
83
  free(ptr);
84
84
}
85
85
 
86
86
 
150
150
 
151
151
void free_dbopt(void *dbopt)
152
152
{
153
 
  my_free((uchar*) dbopt, MYF(0));
 
153
  free((uchar*) dbopt);
154
154
}
155
155
 
156
156
 
292
292
    
293
293
    if ((error= my_hash_insert(&dboptions, (uchar*) opt)))
294
294
    {
295
 
      my_free(opt, MYF(0));
 
295
      free(opt);
296
296
      goto end;
297
297
    }
298
298
  }
1323
1323
  if (check_db_name(&new_db_file_name))
1324
1324
  {
1325
1325
    my_error(ER_WRONG_DB_NAME, MYF(0), new_db_file_name.str);
1326
 
    my_free(new_db_file_name.str, MYF(0));
 
1326
    free(new_db_file_name.str);
1327
1327
 
1328
1328
    if (force_switch)
1329
1329
      mysql_change_db_impl(thd, NULL, thd->variables.collation_server);
1341
1341
                          ER_BAD_DB_ERROR, ER(ER_BAD_DB_ERROR),
1342
1342
                          new_db_file_name.str);
1343
1343
 
1344
 
      my_free(new_db_file_name.str, MYF(0));
 
1344
      free(new_db_file_name.str);
1345
1345
 
1346
1346
      /* Change db to NULL. */
1347
1347
 
1356
1356
      /* Report an error and free new_db_file_name. */
1357
1357
 
1358
1358
      my_error(ER_BAD_DB_ERROR, MYF(0), new_db_file_name.str);
1359
 
      my_free(new_db_file_name.str, MYF(0));
 
1359
      free(new_db_file_name.str);
1360
1360
 
1361
1361
      /* The operation failed. */
1362
1362