Bug#17287443 ERROR(1030): GOT ERROR -1 FROM STORAGE ENGINE

Aditya A · Aditya A · commit e50996c7bc6f · 2013-12-20T11:22:30.000+05:30
PROBLEM
-------
When we try to do DML operations in innodb 
force recovery mode.we get a cryptic error
message.
ERROR(1030): GOT ERROR -1 FROM STORAGE ENGINE

FIX
---
Introduced a new error ER_INNODB_FORCE_RECOVERY 
which will print proper error message. 

[Approved by Kevin and Krunal #rb4095 and rb#4137]
diff --git a/include/my_base.h b/include/my_base.h
@@ -482,7 +482,8 @@ is the global server default. */
 #define HA_ERR_INNODB_READ_ONLY   187    /* InnoDB is in read only mode. */
 #define HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT  188 /* FTS query exceeds result cache limit */
 #define HA_ERR_TEMP_FILE_WRITE_FAILURE	189	/* Temporary file write failure */
-#define HA_ERR_LAST               189    /* Copy of last error nr */
+#define HA_ERR_INNODB_FORCED_RECOVERY 190	/* Innodb is in force recovery mode */
+#define HA_ERR_LAST 190    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h
@@ -92,7 +92,8 @@ static const char *handler_error_messages[]=
   "Row in wrong partition",
   "InnoDB is in read only mode",
   "FTS query exceeds result cache memory limit",
-  "Temporary file write failure"
+  "Temporary file write failure",
+  "Operation not allowed when innodb_forced_recovery > 0"
 };
 
 extern void my_handler_error_register(void);
diff --git a/sql/handler.cc b/sql/handler.cc
@@ -556,7 +556,7 @@ int ha_init_errors(void)
   SETMSG(HA_ERR_TABLESPACE_EXISTS,      "Tablespace already exists");
   SETMSG(HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT,  "FTS query exceeds result cache limit");
   SETMSG(HA_ERR_TEMP_FILE_WRITE_FAILURE,	ER_DEFAULT(ER_TEMP_FILE_WRITE_FAILURE));
-
+  SETMSG(HA_ERR_INNODB_FORCED_RECOVERY,	ER_DEFAULT(ER_INNODB_FORCED_RECOVERY));
   /* Register the error messages for use with my_error(). */
   return my_error_register(get_handler_errmsgs, HA_ERR_FIRST, HA_ERR_LAST);
 }
@@ -3721,6 +3721,9 @@ void handler::print_error(int error, myf errflag)
   case HA_ERR_TEMP_FILE_WRITE_FAILURE:
     textno= ER_TEMP_FILE_WRITE_FAILURE;
     break;
+  case HA_ERR_INNODB_FORCED_RECOVERY:
+    textno= ER_INNODB_FORCED_RECOVERY;
+    break;
   default:
     {
       /* The error was "unknown" to this function.
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
@@ -7094,6 +7094,8 @@ ER_INNODB_FT_AUX_NOT_HEX_ID
 ER_OLD_TEMPORALS_UPGRADED
   eng "TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format."
 
+ER_INNODB_FORCED_RECOVERY
+  eng "Operation not allowed when innodb_forced_recovery > 0."
 #
 #  End of 5.6 error messages.
 #
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -1387,6 +1387,9 @@ convert_error_code_to_mysql(
 		return(HA_ERR_FOUND_DUPP_KEY);
 
 	case DB_READ_ONLY:
+		if(srv_force_recovery) {
+			return(HA_ERR_INNODB_FORCED_RECOVERY);
+		}
 		return(HA_ERR_TABLE_READONLY);
 
 	case DB_FOREIGN_DUPLICATE_KEY:
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
@@ -237,7 +237,9 @@ ha_innobase::check_if_supported_inplace_alter(
 			innobase_get_err_msg(ER_READ_ONLY_MODE);
 		DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
 	} else if (srv_created_new_raw || srv_force_recovery) {
-		ha_alter_info->unsupported_reason =
+
+		ha_alter_info->unsupported_reason =(srv_force_recovery)?
+			innobase_get_err_msg(ER_INNODB_FORCED_RECOVERY):
 			innobase_get_err_msg(ER_READ_ONLY_MODE);
 		DBUG_RETURN(HA_ALTER_INPLACE_NOT_SUPPORTED);
 	}
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
@@ -1277,7 +1277,9 @@ row_insert_for_mysql(
 		      " newraw is replaced\n"
 		      "InnoDB: with raw, and innodb_force_... is removed.\n",
 		      stderr);
-
+		if(srv_force_recovery) {
+			return(DB_READ_ONLY);
+		}
 		return(DB_ERROR);
 	}
 
@@ -1662,7 +1664,9 @@ row_update_for_mysql(
 		      " is replaced\n"
 		      "InnoDB: with raw, and innodb_force_... is removed.\n",
 		      stderr);
-
+		if(srv_force_recovery) {
+			return(DB_READ_ONLY);
+		}
 		return(DB_ERROR);
 	}
 
@@ -4727,6 +4731,9 @@ row_rename_table_for_mysql(
 		      " is replaced\n"
 		      "InnoDB: with raw, and innodb_force_... is removed.\n",
 		      stderr);
+		if(srv_force_recovery) {
+			err = DB_READ_ONLY;
+		}
 
 		goto funct_exit;
 	} else if (row_mysql_is_system_table(new_name)) {

Original file line number	Diff line number	Diff line change
`@@ -7094,6 +7094,8 @@ ER_INNODB_FT_AUX_NOT_HEX_ID`
`7094`	`7094`	`ER_OLD_TEMPORALS_UPGRADED`
`7095`	`7095`	`eng "TIME/TIMESTAMP/DATETIME columns of old format have been upgraded to the new format."`
`7096`	`7096`
	`7097`	`+ER_INNODB_FORCED_RECOVERY`
	`7098`	`+ eng "Operation not allowed when innodb_forced_recovery > 0."`
`7097`	`7099`	`#`
`7098`	`7100`	`# End of 5.6 error messages.`
`7099`	`7101`	`#`