Merge bk-internal.mysql.com:/home/bk/mysql-maria

into  mysql.com:/home/my/mysql-maria


client/mysqladmin.cc:
  Auto merged
include/maria.h:
  Auto merged
include/my_sys.h:
  Auto merged
include/mysql_com.h:
  Auto merged
mysql-test/r/maria.result:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/maria/ma_bitmap.c:
  Auto merged
storage/maria/ma_blockrec.c:
  Auto merged
storage/maria/ma_blockrec.h:
  Auto merged
storage/maria/ma_check.c:
  Auto merged
storage/maria/ma_create.c:
  Auto merged
storage/maria/ma_delete.c:
  Auto merged
storage/maria/ma_loghandler.h:
  Auto merged
storage/maria/ma_open.c:
  Auto merged
storage/maria/ma_search.c:
  Auto merged
storage/maria/ma_sort.c:
  Auto merged
storage/maria/ma_test2.c:
  Auto merged
storage/maria/ma_test_recovery.expected:
  Auto merged
storage/maria/ma_write.c:
  Auto merged
storage/maria/maria_chk.c:
  Auto merged
storage/maria/maria_pack.c:
  Auto merged
include/my_base.h:
  Trivial manual merge
libmysql/Makefile.shared:
  Trivial manual merge
sql/sql_yacc.yy:
  Manual merge
storage/maria/ha_maria.cc:
  Trivial manual merge
storage/maria/ma_page.c:
  Trivial manual merge
storage/maria/maria_def.h:
  Trivial manual merge

1 files changed, 7 insertions, 5 deletions

diff --git a/storage/maria/ma_loghandler.h b/storage/maria/ma_loghandler.h
index 9ea3bfca263..f6629f6fd64 100644
--- a/storage/maria/ma_loghandler.h
+++ b/storage/maria/ma_loghandler.h
@@ -46,7 +46,7 @@
 /* short transaction ID type */
 typedef uint16 SHORT_TRANSACTION_ID;
 
-struct st_maria_info;
+struct st_maria_handler;
 
 /* Changing one of the "SIZE" below will break backward-compatibility! */
 /* Length of CRC at end of pages */
@@ -236,7 +236,7 @@ extern my_bool translog_init(const char *directory, uint32 log_file_max_size,
 extern my_bool
 translog_write_record(LSN *lsn, enum translog_record_type type,
                       struct st_transaction *trn,
-                      struct st_maria_info *tbl_info,
+                      MARIA_HA *tbl_info,
                       translog_size_t rec_len, uint part_no,
                       LEX_STRING *parts_data, uchar *store_share_id,
                       void *hook_arg);
@@ -272,7 +272,7 @@ extern my_bool translog_unlock();
 extern void translog_lock_assert_owner();
 extern TRANSLOG_ADDRESS translog_get_horizon();
 extern TRANSLOG_ADDRESS translog_get_horizon_no_lock();
-extern int translog_assign_id_to_share(struct st_maria_info *tbl_info,
+extern int translog_assign_id_to_share(struct st_maria_handler *tbl_info,
                                        struct st_transaction *trn);
 extern void translog_deassign_id_from_share(struct st_maria_share *share);
 extern void
@@ -307,11 +307,13 @@ struct st_translog_parts
 };
 
 typedef my_bool(*prewrite_rec_hook) (enum translog_record_type type,
-                                     TRN *trn, struct st_maria_info *tbl_info,
+                                     TRN *trn,
+                                     struct st_maria_handler *tbl_info,
                                      void *hook_arg);
 
 typedef my_bool(*inwrite_rec_hook) (enum translog_record_type type,
-                                    TRN *trn, struct st_maria_info *tbl_info,
+                                    TRN *trn,
+                                    struct st_maria_handler *tbl_info,
                                     LSN *lsn, void *hook_arg);
 
 typedef uint16(*read_rec_hook) (enum translog_record_type type,