← Back to branch summary

~linuxjedi/drizzle/drizzle-bug-647360

« back to all changes in this revision

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

  • Committer: lbieber
  • Date: 2010-09-21 21:31:00 UTC
  • mfrom: (1782.1.3 build)
  • Revision ID: lbieber@orisndriz08-20100921213100-b48hhnvgsb1qu35m
Merge Stewart - fix bug 578645 - file_io_threads is deprecated but still exists (and does no
thing)
Merge Shrews - fix bug 643905 -  Transaction ID gets set incorrectly with concurrent session
s
Merge Andrew - Enable boost filesystem requirement and fix linking requirements for it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0start.c
1296
1296
                return(DB_ERROR);
1297
1297
        }
1298
1298
 
1299
 
        /* If user has set the value of innodb_file_io_threads then
1300
 
        we'll emit a message telling the user that this parameter
1301
 
        is now deprecated. */
1302
 
        if (srv_n_file_io_threads != 4) {
1303
 
                fprintf(stderr, "InnoDB: Warning:"
1304
 
                        " innodb_file_io_threads is deprecated."
1305
 
                        " Please use innodb_read_io_threads and"
1306
 
                        " innodb_write_io_threads instead\n");
1307
 
        }
 
1299
        /* innodb_file_io_threads used to be user settable.
 
1300
           It is now just a combination of read_io_threads and
 
1301
           write_io_threads that is set by innodb internally. */
1308
1302
 
1309
1303
        /* Now overwrite the value on srv_n_file_io_threads */
1310
1304
        srv_n_file_io_threads = 2 + srv_n_read_io_threads