← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Andrew Hutchings
  • Date: 2010-12-06 19:36:53 UTC
  • mfrom: (1976 staging)
  • mto: This revision was merged to the branch mainline in revision 1991.
  • Revision ID: andrew@linuxjedi.co.uk-20101206193653-l85vryv18jb0yxx8
Merge with trunk

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
 
 
1345
1330
        err = buf_pool_init(srv_buf_pool_size, srv_buf_pool_instances);
1346
1331
 
1347
 
        ut_print_timestamp(stderr);
1348
 
        fprintf(stderr,
1349
 
                "  InnoDB: Completed initialization of buffer pool\n");
1350
 
 
1351
1332
        if (err != DB_SUCCESS) {
1352
1333
                fprintf(stderr,
1353
1334
                        "InnoDB: Fatal error: cannot allocate the memory"
1864
1845
        if (srv_print_verbose_log) {
1865
1846
                ut_print_timestamp(stderr);
1866
1847
                fprintf(stderr,
1867
 
                        "  InnoDB %s started; "
 
1848
                        " InnoDB %s started; "
1868
1849
                        "log sequence number %"PRIu64"\n",
1869
1850
                        INNODB_VERSION_STR, srv_start_lsn);
1870
1851
        }