Commit 232dec09 authored by unknown's avatar unknown
Browse files

mysqld.cc: 

  Backport option description change from 5.1 to 5.0.


sql/mysqld.cc:
  Backport option description change from 5.1 to 5.0.
parent 358e0883

sql/mysqld.cc

+5 −5
Original line number Diff line number Diff line
@@ -5315,8 +5315,12 @@ log and this option does nothing anymore.", 
  {"symbolic-links", 's', "Enable symbolic link support.",

   (gptr*) &my_use_symdir, (gptr*) &my_use_symdir, 0, GET_BOOL, NO_ARG,

   IF_PURIFY(0,1), 0, 0, 0, 0, 0},

  {"sysdate-is-now", OPT_SYSDATE_IS_NOW,

   "Non-default option to alias SYSDATE() to NOW() to make it safe-replicable. Since 5.0, SYSDATE() returns a `dynamic' value different for different invocations, even within the same statement.",

   (gptr*) &global_system_variables.sysdate_is_now,

   0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},

  {"tc-heuristic-recover", OPT_TC_HEURISTIC_RECOVER,

   "Decision to use in heuristic recover process. Possible values are COMMIT or ROLLBACK",

   "Decision to use in heuristic recover process. Possible values are COMMIT or ROLLBACK.",

   (gptr*) &opt_tc_heuristic_recover, (gptr*) &opt_tc_heuristic_recover,

   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},

  {"temp-pool", OPT_TEMP_POOL,
@@ -5936,10 +5940,6 @@ The minimum value for this variable is 4096.", 
   (gptr*) &max_system_variables.net_wait_timeout, 0, GET_ULONG,

   REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, IF_WIN(INT_MAX32/1000, LONG_TIMEOUT),

   0, 1, 0},

  {"sysdate-is-now", OPT_SYSDATE_IS_NOW,

   "Non-default flag to alias SYSDATE() to NOW() to be safe-replicatable. Since 5.0 SYSDATE returns a `dynamic' value different for different invocation even within a query",

   (gptr*) &global_system_variables.sysdate_is_now,

   0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 1, 0},

  {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}

};