Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-maria

into  desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria-pin


storage/maria/ma_loghandler.c:
  Auto merged

storage/maria/ma_control_file.c

@@ -422,7 +422,7 @@ int ma_control_file_write_and_force(const LSN checkpoint_lsn, uint32 logno,
   DBUG_ASSERT(control_file_fd >= 0); /* must be open */
 #ifndef DBUG_OFF
   if (maria_multi_threaded)
-    translog_lock_assert_owner();
+    translog_lock_handler_assert_owner();
 #endif
 
   if (objs_to_write == CONTROL_FILE_UPDATE_ONLY_LSN)

storage/maria/ma_loghandler.h

@@ -302,9 +302,9 @@ extern int translog_read_next_record_header(TRANSLOG_SCANNER_DATA *scanner,
 extern LSN translog_get_file_max_lsn_stored(uint32 file);
 extern my_bool translog_purge(TRANSLOG_ADDRESS low);
 extern my_bool translog_is_file(uint file_no);
-extern my_bool translog_lock();
-extern my_bool translog_unlock();
-extern void translog_lock_assert_owner();
+extern void translog_lock();
+extern void translog_unlock();
+extern void translog_lock_handler_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_handler *tbl_info,