Commit 68c558ee authored by unknown's avatar unknown
Browse files

merge 


sql/field.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_select.h:
  Auto merged
parents cfc234da 1ef3c696

sql/examples/ha_archive.cc

+13 −10
Original line number Diff line number Diff line
@@ -140,16 +140,19 @@ static handlerton archive_hton = { 
  "archive",

  0,       /* slot */

  0,       /* savepoint size. */

  0,       /* close_connection */

  0,       /* savepoint */

  0,       /* rollback to savepoint */

  0,       /* releas savepoint */

  0,       /* commit */

  0,       /* rollback */

  0,       /* prepare */

  0,       /* recover */

  0,       /* commit_by_xid */

  0,       /* rollback_by_xid */

  NULL,    /* close_connection */

  NULL,    /* savepoint */

  NULL,    /* rollback to savepoint */

  NULL,    /* releas savepoint */

  NULL,    /* commit */

  NULL,    /* rollback */

  NULL,    /* prepare */

  NULL,    /* recover */

  NULL,    /* commit_by_xid */

  NULL,    /* rollback_by_xid */

  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

};

sql/examples/ha_example.cc

+13 −10
Original line number Diff line number Diff line
@@ -77,16 +77,19 @@ static handlerton example_hton= { 
  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

  0,       /* close_connection */

  0,       /* savepoint */

  0,       /* rollback to savepoint */

  0,       /* release savepoint */

  0,       /* commit */

  0,       /* rollback */

  0,       /* prepare */

  0,       /* recover */

  0,       /* commit_by_xid */

  0,       /* rollback_by_xid */

  NULL,    /* close_connection */

  NULL,    /* savepoint */

  NULL,    /* rollback to savepoint */

  NULL,    /* release savepoint */

  NULL,    /* commit */

  NULL,    /* rollback */

  NULL,    /* prepare */

  NULL,    /* recover */

  NULL,    /* commit_by_xid */

  NULL,    /* rollback_by_xid */

  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

};

sql/examples/ha_tina.cc

+13 −10
Original line number Diff line number Diff line
@@ -58,16 +58,19 @@ static handlerton tina_hton= { 
  "CSV",

  0,       /* slot */

  0,       /* savepoint size. */

  0,       /* close_connection */

  0,       /* savepoint */

  0,       /* rollback to savepoint */

  0,       /* release savepoint */

  0,       /* commit */

  0,       /* rollback */

  0,       /* prepare */

  0,       /* recover */

  0,       /* commit_by_xid */

  0,       /* rollback_by_xid */

  NULL,    /* close_connection */

  NULL,    /* savepoint */

  NULL,    /* rollback to savepoint */

  NULL,    /* release savepoint */

  NULL,    /* commit */

  NULL,    /* rollback */

  NULL,    /* prepare */

  NULL,    /* recover */

  NULL,    /* commit_by_xid */

  NULL,    /* rollback_by_xid */

  NULL,    /* create_cursor_read_view */

  NULL,    /* set_cursor_read_view */

  NULL,    /* close_cursor_read_view */

  HTON_NO_FLAGS

};

sql/field.cc

+4 −4
Original line number Diff line number Diff line
@@ -4544,7 +4544,7 @@ int Field_timestamp::store(longlong nr) 
  THD *thd= table->in_use;



  /* We don't want to store invalid or fuzzy datetime values in TIMESTAMP */

  long tmp= number_to_datetime(nr, &l_time, (thd->variables.sql_mode &

  longlong tmp= number_to_datetime(nr, &l_time, (thd->variables.sql_mode &

                                                 MODE_NO_ZERO_DATE) |

                                   MODE_NO_ZERO_IN_DATE, &error);

  if (tmp < 0)
@@ -5390,7 +5390,7 @@ int Field_newdate::store(double nr) 
int Field_newdate::store(longlong nr)

{

  TIME l_time;

  long tmp;

  longlong tmp;

  int error;

  if ((tmp= number_to_datetime(nr, &l_time,

                               (TIME_FUZZY_DATE |

sql/ha_berkeley.cc

+3 −0
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ static handlerton berkeley_hton = { 
  NULL, /* recover */

  NULL, /* commit_by_xid */

  NULL, /* rollback_by_xid */

  NULL, /* create_cursor_read_view */

  NULL, /* set_cursor_read_view */

  NULL, /* close_cursor_read_view */

  HTON_CLOSE_CURSORS_AT_COMMIT

};