← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/srv/srv0start.cc

  • Committer: Lee Bieber
  • Date: 2010-12-28 17:42:52 UTC
  • mfrom: (2023.3.32 innodb-cxx)
  • Revision ID: kalebral@gmail.com-20101228174252-fy2isiqdaphf2gl3
Merge Monty, move innobase from C to C++

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0start.cc
281
281
                return(FALSE);
282
282
        }
283
283
 
284
 
        srv_data_file_names = malloc(i * sizeof *srv_data_file_names);
285
 
        srv_data_file_sizes = malloc(i * sizeof *srv_data_file_sizes);
286
 
        srv_data_file_is_raw_partition = malloc(
287
 
                i * sizeof *srv_data_file_is_raw_partition);
 
284
        srv_data_file_names = static_cast<char **>(malloc(i * sizeof *srv_data_file_names));
 
285
        srv_data_file_sizes = static_cast<ulint *>(malloc(i * sizeof *srv_data_file_sizes));
 
286
        srv_data_file_is_raw_partition = static_cast<ulint *>(malloc(
 
287
                                                                     i * sizeof *srv_data_file_is_raw_partition));
288
288
 
289
289
        srv_n_data_files = i;
290
290
 
414
414
                return(FALSE);
415
415
        }
416
416
 
417
 
        srv_log_group_home_dirs = malloc(i * sizeof *srv_log_group_home_dirs);
 
417
        srv_log_group_home_dirs = static_cast<char **>(malloc(i * sizeof *srv_log_group_home_dirs));
418
418
 
419
419
        /* Then store the actual values to our array */
420
420
 
463
463
/********************************************************************//**
464
464
I/o-handler thread function.
465
465
@return OS_THREAD_DUMMY_RETURN */
466
 
static
 
466
extern "C"
 
467
os_thread_ret_t
 
468
io_handler_thread(void* arg);
 
469
 
 
470
extern "C"
467
471
os_thread_ret_t
468
472
io_handler_thread(
469
473
/*==============*/
507
511
void
508
512
srv_normalize_path_for_win(
509
513
/*=======================*/
510
 
        char*   str __attribute__((unused)))    /*!< in/out: null-terminated
 
514
        char*   /*str __attribute__((unused))*/)        /*!< in/out: null-terminated
511
515
                                                character string */
512
516
{
513
517
#ifdef __WIN__
1248
1252
                     &srv_monitor_file_mutex, SYNC_NO_ORDER_CHECK);
1249
1253
 
1250
1254
        if (srv_innodb_status) {
1251
 
                srv_monitor_file_name = mem_alloc(
 
1255
          srv_monitor_file_name = static_cast<char *>(mem_alloc(
1252
1256
                        strlen(fil_path_to_mysql_datadir)
1253
 
                        + 20 + sizeof "/innodb_status.");
 
1257
                        + 20 + sizeof "/innodb_status."));
1254
1258
                sprintf(srv_monitor_file_name, "%s/innodb_status.%lu",
1255
1259
                        fil_path_to_mysql_datadir, os_proc_get_number());
1256
1260
                srv_monitor_file = fopen(srv_monitor_file_name, "w+");