Resolved comments

Author: varundeepsaini

mysql-test/suite/innodb/r/deadlock_session_info.result

@@ -31,8 +31,8 @@ LOCK WAIT 3 lock struct(s), heap size 1144, 2 row lock(s)
 MariaDB thread id TID, OS thread handle TID, query id QID localhost root Statistics
 SELECT * FROM t WHERE a = 2 FOR UPDATE
 *** WAITING FOR THIS LOCK TO BE GRANTED:
-RECORD LOCKS space id 8 page no 3 n bits 320 index PRIMARY of table `test`.`t` trx id TRX_ID lock_mode X locks rec but not gap waiting
-Record lock,
+RECORD LOCKS space id ID page no 3 n bits 320 index PRIMARY of table `test`.`t` trx id TRX_ID lock_mode X locks rec but not gap waiting
+
 Error	1213	Deadlock found when trying to get lock; try restarting transaction
 ROLLBACK;
 connection con2;

mysql-test/suite/innodb/t/deadlock_session_info.test

@@ -31,7 +31,7 @@ SET debug_dbug = '+d,innodb_deadlock_victim_self';
 --error ER_LOCK_DEADLOCK
 SELECT * FROM t WHERE a = 2 FOR UPDATE;
 
---replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/TIMESTAMP/ /0x[0-9a-f]+/0xTHD/ /OS thread handle [0-9]+/OS thread handle TID/ /thread id [0-9]+/thread id TID/ /query id [0-9]+/query id QID/ /trx id [0-9]+/trx id TRX_ID/ /TRANSACTION [0-9]+/TRANSACTION TRX_ID/
+--replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/TIMESTAMP/ /0x[0-9a-f]+/0xTHD/ /OS thread handle [0-9]+/OS thread handle TID/ /thread id [0-9]+/thread id TID/ /query id [0-9]+/query id QID/ /trx id [0-9]+/trx id TRX_ID/ /TRANSACTION [0-9]+/TRANSACTION TRX_ID/ /space id [0-9]+/space id ID/ /Rec.*//
 SHOW WARNINGS;
 
 ROLLBACK;

storage/innobase/handler/ha_innodb.cc

@@ -2104,9 +2104,8 @@ convert_error_code_to_mysql(
 		/* Since we rolled back the whole transaction, the
 		cached binlog must be emptied. */
 		innodb_transaction_abort(thd, true, error);
-		if (error == DB_DEADLOCK)
-			return HA_ERR_LOCK_DEADLOCK;
-		return HA_ERR_RECORD_CHANGED;
+		return error == DB_DEADLOCK
+			? HA_ERR_LOCK_DEADLOCK : HA_ERR_RECORD_CHANGED;
 
 	case DB_LOCK_WAIT_TIMEOUT:
 		/* Starting from 5.0.13, we let MySQL just roll back the

storage/innobase/lock/lock0lock.cc

@@ -7309,8 +7309,7 @@ and less modified rows. Bit 0 is used to prefer orig_trx in case of a tie.
 
         if (srv_print_all_deadlocks)
         {
-          rewind(lock_latest_err_file);
-          fseek(lock_latest_err_file, 0, SEEK_END);
+          fflush(lock_latest_err_file);
           long file_size= ftell(lock_latest_err_file);
           if (file_size > 0)
           {
@@ -7344,8 +7343,11 @@ and less modified rows. Bit 0 is used to prefer orig_trx in case of a tie.
 
     if (deadlock_info && victim == trx && trx->mysql_thd)
     {
-      push_warning_printf(trx->mysql_thd, Sql_condition::WARN_LEVEL_NOTE,
-                          ER_LOCK_DEADLOCK, "%s", deadlock_info);
+      while (deadlock_info_len > 0 && deadlock_info[deadlock_info_len - 1] == '\n')
+        deadlock_info[--deadlock_info_len]= '\0';
+      if (deadlock_info_len > 0)
+        push_warning(trx->mysql_thd, Sql_condition::WARN_LEVEL_NOTE,
+                     ER_LOCK_DEADLOCK, deadlock_info);
     }
     ut_free(deadlock_info);