← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/haildb/haildb_engine.cc

  • Committer: Brian Aker
  • Date: 2010-10-31 23:41:31 UTC
  • mfrom: (1892.2.1 lintian-warnings)
  • Revision ID: brian@tangent.org-20101031234131-0y4fjb56c8tm95ra
Merge Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/haildb/haildb_engine.cc
2879
2879
    if (innobase_additional_mem_pool_size > LONG_MAX || innobase_additional_mem_pool_size < 512*1024L)
2880
2880
    {
2881
2881
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of additional-mem-pool-size"));
2882
 
      exit(-1);
 
2882
      return 1;
2883
2883
    }
2884
2884
    innobase_additional_mem_pool_size/= 1024;
2885
2885
    innobase_additional_mem_pool_size*= 1024;
2890
2890
    if (srv_auto_extend_increment > 1000L || srv_auto_extend_increment < 1L)
2891
2891
    {
2892
2892
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of autoextend-increment"));
2893
 
      exit(-1);
 
2893
      return 1;
2894
2894
    }
2895
2895
  }
2896
2896
 
2899
2899
    if (innobase_buffer_pool_size > INT64_MAX || innobase_buffer_pool_size < 5*1024*1024L)
2900
2900
    {
2901
2901
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of buffer-pool-size"));
2902
 
      exit(-1);
 
2902
      return 1;
2903
2903
    }
2904
2904
    innobase_buffer_pool_size/= 1024*1024L;
2905
2905
    innobase_buffer_pool_size*= 1024*1024L;
2910
2910
    if (srv_io_capacity > (unsigned long)~0L || srv_io_capacity < 100)
2911
2911
    {
2912
2912
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of io-capacity"));
2913
 
      exit(-1);
 
2913
      return 1;
2914
2914
    }
2915
2915
  }
2916
2916
 
2919
2919
    if (innobase_fast_shutdown > 2)
2920
2920
    {
2921
2921
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of fast-shutdown"));
2922
 
      exit(-1);
 
2922
      return 1;
2923
2923
    }
2924
2924
  }
2925
2925
 
2928
2928
    if (srv_flush_log_at_trx_commit > 2)
2929
2929
    {
2930
2930
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of flush-log-at-trx-commit"));
2931
 
      exit(-1);
 
2931
      return 1;
2932
2932
    }
2933
2933
  }
2934
2934
 
2937
2937
    if (innobase_force_recovery > 6)
2938
2938
    {
2939
2939
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of force-recovery"));
2940
 
      exit(-1);
 
2940
      return 1;
2941
2941
    }
2942
2942
  }
2943
2943
 
2946
2946
    if (haildb_log_file_size > INT64_MAX || haildb_log_file_size < 1*1024*1024L)
2947
2947
    {
2948
2948
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-file-size"));
2949
 
      exit(-1);
 
2949
      return 1;
2950
2950
    }
2951
2951
    haildb_log_file_size/= 1024*1024L;
2952
2952
    haildb_log_file_size*= 1024*1024L;
2957
2957
    if (haildb_log_files_in_group > 100 || haildb_log_files_in_group < 2)
2958
2958
    {
2959
2959
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-files-in-group"));
2960
 
      exit(-1);
 
2960
      return 1;
2961
2961
    }
2962
2962
  }
2963
2963
 
2966
2966
    if (innobase_lock_wait_timeout > 1024*1024*1024 || innobase_lock_wait_timeout < 1)
2967
2967
    {
2968
2968
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of lock-wait-timeout"));
2969
 
      exit(-1);
 
2969
      return 1;
2970
2970
    }
2971
2971
  }
2972
2972
 
2975
2975
    if (innobase_log_buffer_size > LONG_MAX || innobase_log_buffer_size < 256*1024L)
2976
2976
    {
2977
2977
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-buffer-size"));
2978
 
      exit(-1);
 
2978
      return 1;
2979
2979
    }
2980
2980
    innobase_log_buffer_size/= 1024;
2981
2981
    innobase_log_buffer_size*= 1024;
2986
2986
    if (innobase_lru_old_blocks_pct > 95 || innobase_lru_old_blocks_pct < 5)
2987
2987
    {
2988
2988
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of lru-old-blocks-pct"));
2989
 
      exit(-1);
 
2989
      return 1;
2990
2990
    }
2991
2991
  }
2992
2992
 
2995
2995
    if (innobase_lru_block_access_recency > ULONG_MAX)
2996
2996
    {
2997
2997
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of lru-block-access-recency"));
2998
 
      exit(-1);
 
2998
      return 1;
2999
2999
    }
3000
3000
  }
3001
3001
 
3004
3004
    if (srv_max_buf_pool_modified_pct > 99)
3005
3005
    {
3006
3006
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of max-dirty-pages-pct"));
3007
 
      exit(-1);
 
3007
      return 1;
3008
3008
    }
3009
3009
  }
3010
3010
 
3013
3013
    if (srv_max_purge_lag > (unsigned long)~0L)
3014
3014
    {
3015
3015
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of max-purge-lag"));
3016
 
      exit(-1);
 
3016
      return 1;
3017
3017
    }
3018
3018
  }
3019
3019
 
3022
3022
    if (innobase_open_files > LONG_MAX || innobase_open_files < 10L)
3023
3023
    {
3024
3024
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of open-files"));
3025
 
      exit(-1);
 
3025
      return 1;
3026
3026
    }
3027
3027
  }
3028
3028
 
3031
3031
    if (innobase_read_io_threads > 64 || innobase_read_io_threads < 1)
3032
3032
    {
3033
3033
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of read-io-threads"));
3034
 
      exit(-1);
 
3034
      return 1;
3035
3035
    }
3036
3036
  }
3037
3037
 
3040
3040
    if (srv_n_spin_wait_rounds > (unsigned long)~0L)
3041
3041
    {
3042
3042
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of sync_spin_loops"));
3043
 
      exit(-1);
 
3043
      return 1;
3044
3044
    }
3045
3045
  }
3046
3046