Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0

set timestamp=1;

SELECT sleep(1),NOW()-SYSDATE() as zero;

sleep(1)	zero

0	0

--sysdate-is-now

#

# BUG#15101 restore aliasing of SYSDATE to NOW in 5.0

# this feature is activated via --sysdate-is-now mysqld init opt

#

# To test here

# 1. SYSDATE() does not distiguish from NOW()

# 2. SYSDATE() obeys set timestamp

set timestamp=1;

SELECT sleep(1),NOW()-SYSDATE() as zero;

# End of 5.0 tests

  OPT_DATETIME_FORMAT,

  OPT_LOG_QUERIES_NOT_USING_INDEXES,

  OPT_DEFAULT_TIME_ZONE,

  OPT_SYSDATE_IS_NOW,

  OPT_OPTIMIZER_SEARCH_DEPTH,

  OPT_OPTIMIZER_PRUNE_LEVEL,

  OPT_UPDATABLE_VIEWS_WITH_LIMIT,

   (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}

};

  DATE_TIME_FORMAT *date_format;

  DATE_TIME_FORMAT *datetime_format;

  DATE_TIME_FORMAT *time_format;

  my_bool sysdate_is_now;

};