← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2010-12-08 22:35:56 UTC
  • mfrom: (1819.9.158 update-innobase)
  • Revision ID: brian@tangent.org-20101208223556-37mi4omqg7lkjzf3
Merge in Stewart's changes, 1.3 changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0start.c
1327
1327
        fil_init(srv_file_per_table ? 50000 : 5000,
1328
1328
                 srv_max_n_open_files);
1329
1329
 
 
1330
        /* Print time to initialize the buffer pool */
 
1331
        ut_print_timestamp(stderr);
 
1332
        fprintf(stderr,
 
1333
                "  InnoDB: Initializing buffer pool, size =");
 
1334
 
 
1335
        if (srv_buf_pool_size >= 1024 * 1024 * 1024) {
 
1336
                fprintf(stderr,
 
1337
                        " %.1fG\n",
 
1338
                        ((double) srv_buf_pool_size) / (1024 * 1024 * 1024));
 
1339
        } else {
 
1340
                fprintf(stderr,
 
1341
                        " %.1fM\n",
 
1342
                        ((double) srv_buf_pool_size) / (1024 * 1024));
 
1343
        }
 
1344
 
1330
1345
        err = buf_pool_init(srv_buf_pool_size, srv_buf_pool_instances);
1331
1346
 
 
1347
        ut_print_timestamp(stderr);
 
1348
        fprintf(stderr,
 
1349
                "  InnoDB: Completed initialization of buffer pool\n");
 
1350
 
1332
1351
        if (err != DB_SUCCESS) {
1333
1352
                fprintf(stderr,
1334
1353
                        "InnoDB: Fatal error: cannot allocate the memory"
1845
1864
        if (srv_print_verbose_log) {
1846
1865
                ut_print_timestamp(stderr);
1847
1866
                fprintf(stderr,
1848
 
                        " InnoDB %s started; "
 
1867
                        "  InnoDB %s started; "
1849
1868
                        "log sequence number %"PRIu64"\n",
1850
1869
                        INNODB_VERSION_STR, srv_start_lsn);
1851
1870
        }