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

1 files changed, 13 insertions, 10 deletions

diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index ae17b60b7e1..97d9ff555b1 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -38,16 +38,19 @@ static handlerton myisammrg_hton= {
   "MRG_MyISAM",
   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
 };