← 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: 2011-01-15 18:13:06 UTC
  • mfrom: (2087.1.2 build)
  • Revision ID: kalebral@gmail.com-20110115181306-v6lyo8ngjl2pzcqw
Merge Monty - fix bug 702571: InnoDB should have file-per-table on by default
Merge Monty - fix bug 583375: support configure option to specify static/dynamic build for a plugin

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/srv/srv0start.cc
1174
1174
 
1175
1175
#endif
1176
1176
 
1177
 
        if (srv_file_flush_method_str == NULL) {
 
1177
        if (srv_file_flush_method_str.empty()) {
1178
1178
                /* These are the default options */
1179
1179
 
1180
1180
                srv_unix_file_flush_method = SRV_UNIX_FSYNC;
1181
1181
 
1182
1182
                srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
1183
1183
#ifndef __WIN__
1184
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "fsync")) {
 
1184
        } else if (srv_file_flush_method_str == "fsync") {
1185
1185
                srv_unix_file_flush_method = SRV_UNIX_FSYNC;
1186
1186
 
1187
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DSYNC")) {
 
1187
        } else if (srv_file_flush_method_str == "O_DSYNC") {
1188
1188
                srv_unix_file_flush_method = SRV_UNIX_O_DSYNC;
1189
1189
 
1190
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "O_DIRECT")) {
 
1190
        } else if (srv_file_flush_method_str == "O_DIRECT") {
1191
1191
                srv_unix_file_flush_method = SRV_UNIX_O_DIRECT;
1192
1192
 
1193
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "littlesync")) {
 
1193
        } else if (srv_file_flush_method_str == "littlesync") {
1194
1194
                srv_unix_file_flush_method = SRV_UNIX_LITTLESYNC;
1195
1195
 
1196
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "nosync")) {
 
1196
        } else if (srv_file_flush_method_str == "nosync") {
1197
1197
                srv_unix_file_flush_method = SRV_UNIX_NOSYNC;
1198
1198
#else
1199
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "normal")) {
 
1199
        } else if (srv_file_flush_method_str == "normal") {
1200
1200
                srv_win_file_flush_method = SRV_WIN_IO_NORMAL;
1201
1201
                srv_use_native_aio = FALSE;
1202
1202
 
1203
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str, "unbuffered")) {
 
1203
        } else if (srv_file_flush_method_str == "unbuffered") {
1204
1204
                srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
1205
1205
                srv_use_native_aio = FALSE;
1206
1206
 
1207
 
        } else if (0 == ut_strcmp(srv_file_flush_method_str,
1208
 
                                  "async_unbuffered")) {
 
1207
        } else if (srv_file_flush_method_str == "async_unbuffered") {
1209
1208
                srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED;
1210
1209
#endif
1211
1210
        } else {
1212
1211
                fprintf(stderr,
1213
1212
                        "InnoDB: Unrecognized value %s for"
1214
1213
                        " innodb_flush_method\n",
1215
 
                        srv_file_flush_method_str);
 
1214
                        srv_file_flush_method_str.c_str());
1216
1215
                return(DB_ERROR);
1217
1216
        }
1218
1217