← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/drizzled.cc

  • Committer: Brian Aker
  • Date: 2009-02-09 23:23:35 UTC
  • Revision ID: brian@tangent.org-20090209232335-loey90k7imus35qm
Remove dead options.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/drizzled.cc
2446
2446
 
2447
2447
enum options_drizzled
2448
2448
{
2449
 
  OPT_ISAM_LOG=256,            OPT_SKIP_NEW,
2450
 
  OPT_SKIP_GRANT,
2451
 
  OPT_ENABLE_LOCK,             OPT_USE_LOCKING,
2452
 
  OPT_SOCKET,                  OPT_UPDATE_LOG,
 
2449
  OPT_ISAM_LOG=256,
 
2450
  OPT_SKIP_NEW,
 
2451
  OPT_SOCKET,
2453
2452
  OPT_BIN_LOG,
2454
 
  OPT_BIN_LOG_INDEX,
2455
2453
  OPT_BIND_ADDRESS,            OPT_PID_FILE,
2456
2454
  OPT_SKIP_PRIOR,
2457
 
  OPT_STANDALONE,
2458
 
  OPT_SHORT_LOG_FORMAT,
2459
2455
  OPT_FLUSH,                   OPT_SAFE,
2460
 
  OPT_STORAGE_ENGINE,          OPT_INIT_FILE,
 
2456
  OPT_STORAGE_ENGINE,          
 
2457
  OPT_INIT_FILE,
2461
2458
  OPT_DELAY_KEY_WRITE_ALL,
2462
2459
  OPT_DELAY_KEY_WRITE,
2463
 
  OPT_MASTER_INFO_FILE,
2464
 
  OPT_MASTER_RETRY_COUNT,      OPT_LOG_TC, OPT_LOG_TC_SIZE,
2465
2460
  OPT_WANT_CORE,
2466
 
  OPT_MEMLOCK,                 OPT_MYISAM_RECOVER,
 
2461
  OPT_MEMLOCK,
 
2462
  OPT_MYISAM_RECOVER,
2467
2463
  OPT_SERVER_ID,
2468
 
  OPT_SKIP_SLAVE_START,
2469
 
  OPT_REPLICATE_SAME_SERVER_ID,
2470
 
  OPT_DISCONNECT_SLAVE_EVENT_COUNT, OPT_TC_HEURISTIC_RECOVER,
2471
 
  OPT_ABORT_SLAVE_EVENT_COUNT,
 
2464
  OPT_TC_HEURISTIC_RECOVER,
2472
2465
  OPT_ENGINE_CONDITION_PUSHDOWN,
2473
2466
  OPT_TEMP_POOL, OPT_TX_ISOLATION, OPT_COMPLETION_TYPE,
2474
2467
  OPT_SKIP_STACK_TRACE, OPT_SKIP_SYMLINKS,
2475
 
  OPT_SAFE_USER_CREATE,
2476
 
  OPT_DO_PSTACK, OPT_REPORT_HOST,
2477
 
  OPT_REPORT_USER, OPT_REPORT_PASSWORD, OPT_REPORT_PORT,
2478
 
  OPT_SHOW_SLAVE_AUTH_INFO,
2479
 
  OPT_SLAVE_LOAD_TMPDIR, OPT_NO_MIX_TYPE,
2480
 
  OPT_RPL_RECOVERY_RANK,
2481
 
  OPT_RELAY_LOG, OPT_RELAY_LOG_INDEX, OPT_RELAY_LOG_INFO_FILE,
2482
 
  OPT_SLAVE_SKIP_ERRORS, OPT_SLAVE_ALLOW_BATCHING, OPT_DES_KEY_FILE, OPT_LOCAL_INFILE,
2483
 
  OPT_SSL_SSL, OPT_SSL_KEY, OPT_SSL_CERT, OPT_SSL_CA,
2484
 
  OPT_SSL_CAPATH, OPT_SSL_CIPHER,
 
2468
  OPT_DO_PSTACK,
 
2469
  OPT_LOCAL_INFILE,
2485
2470
  OPT_BACK_LOG,
2486
2471
  OPT_CONNECT_TIMEOUT,
2487
2472
  OPT_FLUSH_TIME,
2506
2491
  OPT_NET_READ_TIMEOUT, OPT_NET_WRITE_TIMEOUT,
2507
2492
  OPT_PRELOAD_BUFFER_SIZE,
2508
2493
  OPT_RECORD_BUFFER,
2509
 
  OPT_RECORD_RND_BUFFER, OPT_DIV_PRECINCREMENT, OPT_RELAY_LOG_SPACE_LIMIT,
2510
 
  OPT_RELAY_LOG_PURGE,
2511
 
  OPT_SLAVE_NET_TIMEOUT, OPT_SLAVE_COMPRESSED_PROTOCOL, OPT_SLOW_LAUNCH_TIME,
2512
 
  OPT_SLAVE_TRANS_RETRIES, OPT_DEBUGGING,
 
2494
  OPT_RECORD_RND_BUFFER, OPT_DIV_PRECINCREMENT,
 
2495
  OPT_DEBUGGING,
2513
2496
  OPT_SORT_BUFFER, OPT_TABLE_OPEN_CACHE, OPT_TABLE_DEF_CACHE,
2514
 
  OPT_THREAD_CONCURRENCY, OPT_THREAD_CACHE_SIZE,
2515
2497
  OPT_TMP_TABLE_SIZE, OPT_THREAD_STACK,
2516
2498
  OPT_WAIT_TIMEOUT,
2517
2499
  OPT_DEFAULT_WEEK_FORMAT,
2518
2500
  OPT_RANGE_ALLOC_BLOCK_SIZE,
2519
2501
  OPT_QUERY_ALLOC_BLOCK_SIZE, OPT_QUERY_PREALLOC_SIZE,
2520
2502
  OPT_TRANS_ALLOC_BLOCK_SIZE, OPT_TRANS_PREALLOC_SIZE,
2521
 
  OPT_SYNC_FRM,
2522
 
  OPT_SYNC_REPLICATION,
2523
 
  OPT_SYNC_REPLICATION_SLAVE_ID,
2524
 
  OPT_SYNC_REPLICATION_TIMEOUT,
2525
 
  OPT_ENABLE_SHARED_MEMORY,
2526
 
  OPT_SHARED_MEMORY_BASE_NAME,
2527
2503
  OPT_OLD_ALTER_TABLE,
2528
 
  OPT_EXPIRE_LOGS_DAYS,
2529
2504
  OPT_GROUP_CONCAT_MAX_LEN,
2530
2505
  OPT_DEFAULT_COLLATION,
2531
 
  OPT_CHARACTER_SET_CLIENT_HANDSHAKE,
2532
2506
  OPT_CHARACTER_SET_FILESYSTEM,
2533
2507
  OPT_LC_TIME_NAMES,
2534
2508
  OPT_INIT_CONNECT,
2535
 
  OPT_INIT_SLAVE,
2536
 
  OPT_SECURE_AUTH,
2537
2509
  OPT_DATE_FORMAT,
2538
2510
  OPT_TIME_FORMAT,
2539
2511
  OPT_DATETIME_FORMAT,
2545
2517
  OPT_AUTO_INCREMENT, OPT_AUTO_INCREMENT_OFFSET,
2546
2518
  OPT_ENABLE_LARGE_PAGES,
2547
2519
  OPT_TIMED_MUTEXES,
2548
 
  OPT_OLD_STYLE_USER_LIMITS,
2549
2520
  OPT_TABLE_LOCK_WAIT_TIMEOUT,
2550
2521
  OPT_PLUGIN_LOAD,
2551
2522
  OPT_PLUGIN_DIR,
2552
2523
  OPT_PORT_OPEN_TIMEOUT,
2553
 
  OPT_PROFILING,
2554
2524
  OPT_KEEP_FILES_ON_CREATE,
2555
 
  OPT_GENERAL_LOG,
2556
 
  OPT_THREAD_HANDLING,
2557
 
  OPT_INNODB_ROLLBACK_ON_TIMEOUT,
2558
2525
  OPT_SECURE_FILE_PRIV,
2559
2526
  OPT_MIN_EXAMINED_ROW_LIMIT,
2560
 
  OPT_OLD_MODE,
2561
 
  OPT_POOL_OF_THREADS,
2562
 
  OPT_SLAVE_EXEC_MODE
 
2527
  OPT_OLD_MODE
2563
2528
};
2564
2529
 
2565
2530
 
3410
3375
  case 'L':
3411
3376
    strncpy(language, argument, sizeof(language)-1);
3412
3377
    break;
3413
 
  case OPT_SLAVE_SKIP_ERRORS:
3414
 
    break;
3415
 
  case OPT_SLAVE_EXEC_MODE:
3416
 
    break;
3417
3378
  case 'V':
3418
3379
    print_version();
3419
3380
    exit(0);