commit be1f773e4d57b7e7a0994ad5c05ebf9d683aff89
Author: Laurynas Biveinis <laurynas.biveinis@gmail.com>
Date:   Tue Sep 27 12:40:06 2016 +0300

    Fix bug 83124 / 1626936 (Bug 81657 fix merge to 5.6 broken)
    
    Make THD::decide_logging_format call get_locked_tables_mode_name, fix
    enum_locked_tables_mode comment.

diff --git a/sql/binlog.cc b/sql/binlog.cc
index 43a0c88..e562c05 100644
--- a/sql/binlog.cc
+++ b/sql/binlog.cc
@@ -10058,15 +10058,8 @@ int THD::decide_logging_format(TABLE_LIST *tables)
     */
     bool warned_gtid_executed_table= false;
 #ifndef DBUG_OFF
-    {
-      static const char *prelocked_mode_name[] = {
-        "NON_PRELOCKED",
-        "PRELOCKED",
-        "PRELOCKED_UNDER_LOCK_TABLES",
-      };
-      DBUG_PRINT("debug", ("prelocked_mode: %s",
-                           prelocked_mode_name[locked_tables_mode]));
-    }
+    DBUG_PRINT("debug", ("prelocked_mode: %s",
+                         get_locked_tables_mode_name(locked_tables_mode)));
 #endif
 
     if (variables.binlog_format != BINLOG_FORMAT_ROW && tables)
diff --git a/sql/sql_class.h b/sql/sql_class.h
index 76043a2..fa03efd 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -311,7 +311,7 @@ typedef I_List<Item_change_record> Item_change_list;
   Type of locked tables mode.
   See comment for THD::locked_tables_mode for complete description.
   While adding new enum values add them to the getter method for this enum
-  declared below and defined in sql_class.cc as well.
+  declared below and defined in binlog.cc as well.
 */
 
 enum enum_locked_tables_mode